diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index a9f0acb6b9e5..7a8264327590 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,3 +1,3 @@
 DIST wcd-5.2.7.tar.gz 622613 SHA256 e5f56824e054c6726186271b20a5de3c5b167116b97785a925907981cf3e3b39 SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e WHIRLPOOL 3354e380dceaed394e0eb9bac3f474edc819270a117baf5812a1e7252b2cef207862746af2b21dd71de837459bc6281a45a9099f5a6351def49e3c1ce780960d
-DIST wcd-5.3.0.tar.gz 617825 SHA256 9375c9b055e0ebff8d0b0a11673229bb9770071bda76249cf2494532794ecd9b SHA512 76f7039428a2792e200a4b070df2e861a5ad5c3a24b26348438974c0dd7bb564a1d495215d07920313da296bb704e5cd4708dc82c1ed2a2f1d79a268b5bb9610 WHIRLPOOL e19431a44e14fb0974e878ddd77800515846e46411415e2eb5db1e8dcf4d6df51e5373203196395d54439ca3b3aae6bc23e12afaf21920452acf1362a670d32d
 DIST wcd-5.3.1.tar.gz 625579 SHA256 bd1705529311e8825a20af742c4c4004857917c623ee9e8fc63ff5c1fb56d525 SHA512 c06882e901555d36fc863fba80ea3bf9633aae4d20e8f151f81c871b3280744bc2cbb66d63d17fe9fd7f0e305a6509c3c198a4366e7fc1a5667ef41e60b61a74 WHIRLPOOL d8baff515bd7938272c7cd323408f19ad7c8a8a4f17914d56543d852568237e86728534dabc7ef3ae7a559e23d71f3229b885dc54109447553bc1dc5384ac7e1
+DIST wcd-5.3.2.tar.gz 595071 SHA256 a16434cb7a177ec8e9be67a1cfe7f6406a7c9190726d0ead5c44afdc4b8d3612 SHA512 3bc8fc27f170576530066bdd0af66887a4ffdd8824c36985d55588c575729b25b4c713cf67f2d70c820fdb7ed7fdaef89375673bc96c7251e74f786fb9501c08 WHIRLPOOL eb198f8ea14fd5d9d4f092abce00ece7e7428afe26bb7a4cdb43ee487ad4bc5fae27e0a3c7b357007037ab2d8d4cad6f63f08f9ca2ff90db7b64cf09521fe51b
diff --git a/app-misc/wcd/wcd-5.3.0.ebuild b/app-misc/wcd/wcd-5.3.2.ebuild
similarity index 80%
rename from app-misc/wcd/wcd-5.3.0.ebuild
rename to app-misc/wcd/wcd-5.3.2.ebuild
index 6d6877d3af55..94d357d5d5aa 100644
--- a/app-misc/wcd/wcd-5.3.0.ebuild
+++ b/app-misc/wcd/wcd-5.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils toolchain-funcs
 
@@ -24,9 +24,15 @@ RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}"/${P}/src
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
+	# Required for stupid eapply function
+	pushd .. &>/dev/null || die
+	default
+	popd &>/dev/null || die
 	tc-export CC
 }
 
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
new file mode 100644
index 000000000000..15ff29ae40a0
--- /dev/null
+++ b/dev-python/attrs/Manifest
@@ -0,0 +1 @@
+DIST attrs-15.2.0.tar.gz 36766 SHA256 9f895d2ecefa0be054e29375769f1d0ee88e93ce820088cf5c49390529bf7ee7 SHA512 f34f70acbd01dc94c6f994ce7c764e169e26f5d71454522f4f88859b67309556e88e20504e2a6a63590e4ad8e55f04ba7cc9a90c024364c1bf932bfadd5a4491 WHIRLPOOL b2eb25ff59faae2d71965f9a8292372be6a02db42333bb8b0d04b9a6eae2924b2f363e4b486db8864ad0a9031968ada8edb3e1f3b8bbf8c2ca5be2c2b0972834
diff --git a/dev-python/attrs/attrs-15.2.0.ebuild b/dev-python/attrs/attrs-15.2.0.ebuild
new file mode 100644
index 000000000000..8a9201a840b7
--- /dev/null
+++ b/dev-python/attrs/attrs-15.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	http://pypi.python.org/pypi/attrs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/attrs/metadata.xml b/dev-python/attrs/metadata.xml
new file mode 100644
index 000000000000..bb6f59e10a0f
--- /dev/null
+++ b/dev-python/attrs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">attrs</remote-id>
+    <maintainer status="unknown">
+      <email>hs@ox.cx</email>
+      <name>Hynek Schlawack</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
index b377f2c57ada..44de1c1bc9f8 100644
--- a/dev-python/flexx/Manifest
+++ b/dev-python/flexx/Manifest
@@ -1,2 +1,3 @@
 DIST flexx-0.2.zip 195542 SHA256 ee3d755d79d7a4336e2cf4145e07881056624db9161cd1aa338402a51575bb72 SHA512 552873073ce32e39cefe466c7f1490b23b4f332594040ee4e423c08b83cb200ab11de25705b43dd95036f0d9c8ece8ae0c6042fda47fe3ab7266e3b6b0e22bad WHIRLPOOL 5dd33657e3725ae18b9e78b315ceb14440461cafd5e6d7ae3e907dd00cc8019447d550f91b58e975b91421a247696e0a517d4e3bb6d2bdf86a207c5e3985cd9d
+DIST flexx-0.3.1.zip 418280 SHA256 aa8aefca3aec283cf555a2b59aa619fdd1b595b62a881cee35e3f36794185f04 SHA512 3d98daa18e0f307ed24386fc59a59a4df1727cdc7483cb1fa7bc6c5b2eb8cba36fbc100a98d8549ac890ef8ba86b9acef77d34e26c99994b918f5344354b0bfd WHIRLPOOL c74eb8e22975c16296ade19f46364c086bcdbfd83dd5a2592033fb6ba53164dab17814a952f34db93b8170f01def4c46423f8e8bbfb6c75c620334535113f9b2
 DIST flexx-0.3.zip 525429 SHA256 6945fb3389446d30c904470dadf02528e5032f7c90fe9b6c66f06063b2faedc4 SHA512 4769ba89a1a7f48dcd044f6e301d56c11fb147e2fd5c8a2614e9099b11f76249d8f13320e7b4566971b0e56bc20bb83c4d48b8f7892b57a82763979d6458d6eb WHIRLPOOL 570e090a196472273bb5fa09dae74006a88887d314db7fd2f183842248c8478bbf210dc8b7487d166de4dc91b1dbb9c72d0621f2402a072464ba28ad01c3b0cf
diff --git a/dev-python/flexx/flexx-0.3.1.ebuild b/dev-python/flexx/flexx-0.3.1.ebuild
new file mode 100644
index 000000000000..cdc8d14dbb81
--- /dev/null
+++ b/dev-python/flexx/flexx-0.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
+HOMEPAGE="
+	http://flexx.readthedocs.org
+	http://github.com/zoofio/flexx
+	http://pypi.python.org/pypi/flexx"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 42ce0517e0fd..2f7720df78f2 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -3,3 +3,4 @@ DIST humanfriendly-1.35.tar.gz 36181 SHA256 de030bb1976b526f514c9a953c38286f50c3
 DIST humanfriendly-1.38.tar.gz 41228 SHA256 1706a6e72c28d4001d2f2c963e74d120d36b9b9047e4026c0909f37b3da5e558 SHA512 2409e00ab9a50537a9ef03216a1e3e31f503a879afdf1b642a63f68e0a839a58d90610548f5ba2db57d32ec8e7106ab160e64b212053dfbbedca00128c1f6fdc WHIRLPOOL 8d2a98dbd08381870464b0e1ff4817b34ec0ac85b321e6cf460bfded0047976c3639898bd5d3811f859fed40f368085be561dc2f61a720deb586a21c181f2398
 DIST humanfriendly-1.42.tar.gz 42222 SHA256 e64417fd2b7e9b1fa0c2264e03a289734c2c7692030059fc4d3a0440b1e87da3 SHA512 464209a84020c799282271bedd23b08c198f77cfe0e1f6175bec4d2b946a024d5fc4d550f5d79c76492f30b73a105484a84faaea4f6602905e289dc5ae5a19c0 WHIRLPOOL 50fdc7166be36df430f626fe4ba6024e2158f5a1345e3b82086e46adb4b78ca5ac861719a6c139d30096c09651f7173176a63d776f60a9cceb86badcfd9781a3
 DIST humanfriendly-1.43.1.tar.gz 42052 SHA256 f0bb35005ed6d873e62bae51edb7ecbff87b9238f9733d40e83c6cd3dda43c8d SHA512 82e6dcf9a0b715a2fc20901f1977764ca2490ed6cc647b401405766fce573c9677fbfe159a181b90ca13a6e222fcfaf52aa887bc9646e3e28ee368a1ab714fdc WHIRLPOOL e5af350534793ec745c61034072412f9203dad123e593202dea080f618d8136f97fc0f93a9955b93c844e0fbfc085296856b2899d86ab5c9742bd745ab9dd695
+DIST humanfriendly-1.44.1.tar.gz 44281 SHA256 a9c545dc284c8e310465dba0b2300d898a9dc0d6eba5852f7578e03ff3ffc4ea SHA512 d5467e75c2e84c50dacaaab1c14b71a536eda5b91f4fc2d6ca69f1f1e50fe0ac215ac6cbf91cf7df08456f3058dcf84f0e38f611022c295e90c936e3b8a77cc9 WHIRLPOOL 869f86cd719fb9f3810767a37f43742ff21e9664229ccc4525873c84288fff8e9f08530796f54f2f1bea3b2df0601a424c5a253a42940c2d6a99cdbe19b20627
diff --git a/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild
new file mode 100644
index 000000000000..eef8e504f86c
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-1.44.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+	)
+	"
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/mccabe/mccabe-0.4.0.ebuild b/dev-python/mccabe/mccabe-0.4.0.ebuild
index 1caff10459e9..4eeee85e31de 100644
--- a/dev-python/mccabe/mccabe-0.4.0.ebuild
+++ b/dev-python/mccabe/mccabe-0.4.0.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 RDEPEND=">=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
 	dev-python/flake8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}] )"
+	dev-python/pytest-runner[${PYTHON_USEDEP}]"
 
 python_test() {
 	${EPYTHON} test_mccabe.py || die
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index e8ac3a4d3258..0ab7c3ef6fcb 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -2,3 +2,4 @@ DIST numba-0.18.2.tar.gz 786935 SHA256 5988621a8dd3609d252435c8e280bf01e2f25d9eb
 DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820268c64837dc8510e66f1e2e SHA512 9eca230b5d69890680278248365e748b2e8a7e040703e80acaed2c0e1dc3576e102bde3809eceb6e600d90e02685e66419ca3423d332620c034fe9c07995aa67 WHIRLPOOL bfba05b56ff9fa9708b67dad1f514bc35c72ac3bf76e349f2ec20c63f7cb9c1664b106898559220e796ae9cafc7a48dbb5e6e537720d6cd4f6b5ccde4903dc67
 DIST numba-0.20.0.tar.gz 895183 SHA256 62dd4eebbd8fef27a8a60b74de2f540b12223939e197877babb13bf06eba5d9f SHA512 d511ed382813471dd2b9f6d99ee7cae4b77375a3c003df44ec2954b0f16c32b0fec76b3c33df46c821f17a4d148afab6c4b2d43429548a5bc81efbebc4fb54e3 WHIRLPOOL 8345bed1965715aace541bfcde33f4a999241fac8f655d80d1bb67db5ae806924fec47e3895b2a61484474fef2d4362d15800aa5be8b1c8f1922eaeb06d432ce
 DIST numba-0.22.1.tar.gz 1101843 SHA256 2b0c95cf9c4f6390b1ff0a238499ee4cc32b3695728293e1d888cd3c15803633 SHA512 0514a04e83f800ba4dba97e5b220fd5d530e923e91769881f9df320a0eedcfb1e652fc87a1cda2d80223e38a25f85387a1930259179996bab7b7a731b86864c0 WHIRLPOOL dd554a15ea3783bfe335ed08b538eed6ec7071986ef4ad63e76e51c3d06783b38dccd0fb5b01b720eab130dbb20d8a2fe8cefd4124a6f57aeb10e74c228fad16
+DIST numba-0.23.1.tar.gz 1284771 SHA256 54359b8ef700a70f0d7a9b9aecb2c58867fd23479f556730d8b3422a132d5735 SHA512 833087ac4272d386eca0434855128773284f0f1f7cd85143088d2184781b070bf2922a7e2378ae90ba53382ffb5c547e9c2e34ec35a9423e1cf2ad9706d7c366 WHIRLPOOL 1cc91acb8acd9e14ace0be14c45e5e1abf5fc28440ad463240f8ed5b18708496b166ebb9134df32170551ac6f7e123d1dcb4897434320bb9471338c008b638ab
diff --git a/dev-python/numba/numba-0.23.1.ebuild b/dev-python/numba/numba-0.23.1.ebuild
new file mode 100644
index 000000000000..cbd0b4239074
--- /dev/null
+++ b/dev-python/numba/numba-0.23.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/llvmlite[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
+
+python_prepare_all() {
+	# Re-set them of doc build to one provided by sphinx
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+	else
+		sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs/ html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	# doc needs obsolete sphinxjp package
+#	use doc && dodoc docs/Numba.pdf
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 0db0dae5c52b..11ea66c76483 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -109,9 +109,9 @@ python_prepare_all() {
 	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
 
 	# we don't have f2py-3.3
-#	sed \
-#		-e 's:test_f2py:_&:g' \
-#		-i numpy/tests/test_scripts.py || die
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
 
 	distutils-r1_python_prepare_all
 	epatch_user
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 4d5625d2214b..52e163594508 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1 +1,2 @@
 DIST service_identity-14.0.0.tar.gz 26033 SHA256 3105a319a7c558490666694f599be0c377ad54824eefb404cde4ce49e74a4f5a SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2 WHIRLPOOL bc6f3cba3e3bec83c527df60dc3cd4387d74baab5a88b5c2cb731661804139c78c86074902060b64e402364ac641b4b2617c98448d4a9e6b367dc0f9d6cd5dac
+DIST service_identity-16.0.0.tar.gz 30270 SHA256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae WHIRLPOOL 598c046bf0e7428d5d3c34e8315bc67a857377af105bddc7d07fde01eaaffb4be62026fdffab6c81eaaff897290ab735c5f3ad3f7f9c4a1bd9f932a39cef9aaf
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
new file mode 100644
index 000000000000..4486647524b0
--- /dev/null
+++ b/dev-python/service_identity/service_identity-16.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="https://github.com/pyca/service_identity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-qt/qtgui/qtgui-5.5.1.ebuild b/dev-qt/qtgui/qtgui-5.5.1.ebuild
deleted file mode 100644
index c40699381bc2..000000000000
--- a/dev-qt/qtgui/qtgui-5.5.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-# TODO: directfb, linuxfb, kms integration in eglfs
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
-	ibus jpeg libinput +png tslib tuio +udev +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	media-libs/fontconfig
-	>=media-libs/freetype-2.5.5:2
-	>=media-libs/harfbuzz-0.9.40:=
-	>=sys-libs/zlib-1.2.5
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	evdev? ( sys-libs/mtdev )
-	gtkstyle? (
-		x11-libs/gtk+:2
-		x11-libs/pango
-		!!x11-libs/cairo[qt4]
-	)
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( x11-libs/tslib )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	xcb? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXrender
-		>=x11-libs/libxcb-1.10:=[xkb]
-		>=x11-libs/libxkbcommon-0.4.1[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl
-	eglfs
-	evdev
-	evdev:mtdev:
-	:fontconfig
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	gtkstyle:gtkstyle:
-	gtkstyle:gtk2:STYLE_GTK
-	!:no-gui:
-	:system-harfbuzz:HARFBUZZ
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon-evdev:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib
-	udev:libudev:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xinput2:
-	xcb::XKB
-)
-
-src_prepare() {
-	# egl_x11 is activated when both egl and xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
-
-	# avoid automagic dep on qtdbus
-	use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
-		src/platformsupport/platformsupport.pro || die
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	# avoid automagic dep on qtnetwork
-	use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
-		src/plugins/generic/generic.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		$(qt_use gtkstyle)
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use libinput xkbcommon-evdev)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use xcb xcb system)
-		$(qt_use xcb xkbcommon-x11 system)
-		$(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 97de9d3c60bb..34d06363b483 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,8 +1,6 @@
 DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
 DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
 DIST rspec-core-3.2.3-git.tgz 276647 SHA256 7122fe372cdf0d4ff60aef42768fc9cc0350bd1943f5c1fa6189153829519ab2 SHA512 a5eb294c4770275662205b4edde2426c7d7ab7f9fb3cea6fc1171071b941a94b6d6386348fd83ba9e76a35512ea56be0b657ba2d8e210fe73c8564e76ebea7ae WHIRLPOOL 895d5fab418ddc5adc9a33078499f59b2865b636516110f0042bd08b4d9ecdb304f135655c0b05102f47725b94da831c986889b8a76eed3e8aa2c693f2d29d63
-DIST rspec-core-3.3.1-git.tgz 332355 SHA256 9dc839186e72fe5d4b4f15500bc2a976d08dc4af859be2b69778b1c4f84d321b SHA512 cddbfc1dae98de2db31a5f9c5a60cf1cdd4995f35bcd1bea525f18fc8b3649d7c8a2e23169873874be22b4f75b14b89d086e2372ed1dd93a157ae03c5989a760 WHIRLPOOL a3e5fa2264b40313c1fcf1890087f218a5a9f442f82528f4422a315858a036ff36cdc671dbb7e1f4d937385e6568cb7950c43ab7249c78b834ba07e5dae671d6
 DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
-DIST rspec-core-3.4.0-git.tgz 354166 SHA256 852bf29d13c30e921126b57233b80a56495465fe80f3a5fb036721f20a74a668 SHA512 9961b99a2209268528a3cee741f682f37300d0bd88c8364ee400073a3274e7465d767f01207db12789debb73a4bcb5dc6eb06039b0364cdf9fd72803fa917bc5 WHIRLPOOL 9d6176434c72a2eacb8d4ca5ae794f0bd0351507bf51a1b102f4eb12dce02a84cbf2f813c801ac5fc591c533ef4ffe995b9e8df374de4ecffe3cb8367e1c1b59
-DIST rspec-core-3.4.1-git.tgz 354375 SHA256 ed75c25573e155b5fd9f57102785294b2f9b4d3796b96279ba977acbb5bf9eb2 SHA512 e472969b7d1571be39438190029690acdcd760b61f7067e8bf66b29324f2eeb7f870f382dacc79738f0aeea1c66bc971b7a8b93ae6a2c3bc61ac539ce4b452a3 WHIRLPOOL 53243e1374d9cc50f950d17e7de30d9dc3f0c3ac0dea16f41c3b36f3160e95d1ab6ed720e83dc508b4925c3340ed4876918fbcfafe937f9b7753cc8888a266a2
 DIST rspec-core-3.4.2-git.tgz 354859 SHA256 bcb93520f5cb2bc0f2f66c09579970c524e7404575cefc5aefcd3da594d775b6 SHA512 33fc3336a01b86f9c22e5e9fe9f78f2b4f66a309fd0bff90d565484912d2ae6525dc80b0e6e2c6d2b5d698c2848e0b025cc4f065b533b9936ba6e7dfb03bae88 WHIRLPOOL 451f5b70bdd9db53fc7fabc84dacff6cd3cbda3422ca475a1090e5bcd2ec42249e91953c0d648c5a4d2ab12af85e778b392a1e75717526d89577ecffe88f0cfa
+DIST rspec-core-3.4.3-git.tgz 355961 SHA256 9dea290b7a1e30e483d61451e968554591a0ce385b66bc75d27d0f9eed7455e3 SHA512 26973fb7de7e2055cfafece0b3d68c2dab3498f6e3705bc2a4d41633b18783d142c7c9bee82fbec0d577b7d97d85c747c8cbdeb0cf8d2b5c017009fa087f2ec2 WHIRLPOOL f52dfaa2dc83efb49f66693e7b9eff20d5237d0593985ed88283247d50e2fa24d6f3739d9c01c0a4fa298b9da1072a01b055b0d4618eadeb8de9e7403cccb7be
diff --git a/dev-ruby/rspec-core/rspec-core-3.2.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.3.ebuild
deleted file mode 100644
index e86374352d1c..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.2.3.ebuild
+++ /dev/null
@@ -1,95 +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 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.0.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	case ${RUBY} in
-		*ruby22)
-			# The rubygems version bundled with ruby 2.2 causes warnings.
-			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild
deleted file mode 100644
index 4a99fdcd2f3c..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild
+++ /dev/null
@@ -1,99 +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 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-# Skip yard for ruby22 for now since we don't support ruby22 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild
deleted file mode 100644
index 182c56c76d06..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid specs for older coderay version which is no longer packaged
-	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
-		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
-		spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
similarity index 93%
rename from dev-ruby/rspec-core/rspec-core-3.4.0.ebuild
rename to dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
index 182c56c76d06..25460b389ddc 100644
--- a/dev-ruby/rspec-core/rspec-core-3.4.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.4.3.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$
 
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index fe93bfad73cc..21b26734350d 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,3 +1,4 @@
 DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb
 DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d68888b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18
 DIST sexp_processor-4.6.1.gem 39424 SHA256 e2e96c2ee3ea81e1dc7b4b4abee23b6e552e669cfe456ee69126a29a03373cd7 SHA512 25513e71e30c0ded46201d81e454ab628054c2380c4b9715d6b05cf08703ce3cc31e7d127514f2abc12d875d0d53791740b728922f91b85ba579931799de09d7 WHIRLPOOL 6cd94d615eec3858e2fcb920526438a9d6a6c4509da48369812fb5235e62814be6a7fbe63b9c392287938127f00900ec89638173a5b64b85a1f8bc6ac9e80d8a
+DIST sexp_processor-4.7.0.gem 39424 SHA256 963a1f5b21c95595fb3cf1e8531784bf3d8fe30302cf6f271b08aefdc63e453f SHA512 6c48853f2eaca37bcddb097f6677d37835171618e4209d07baa1f361d4cdf4ce95a11f892b6b258cd91e51555aa046c404d8970560618b4e8a86fd0d6dca71c7 WHIRLPOOL cad0c31e6aace9066be2d400d392206c7b9f71b2fbdbe072d0a1d98e241acc15f79c0992d45cffc261284f751d1b5046380254b0f050f62fbdad0132437e3b8a
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.7.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.7.0.ebuild
new file mode 100644
index 000000000000..11ef73a19f36
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/hoe-3.13
+		dev-ruby/hoe-seattlerb
+		>=dev-ruby/minitest-5.5
+	)"
diff --git a/media-gfx/valentina/valentina-0.4.2.ebuild b/media-gfx/valentina/valentina-0.4.2-r1.ebuild
similarity index 92%
rename from media-gfx/valentina/valentina-0.4.2.ebuild
rename to media-gfx/valentina/valentina-0.4.2-r1.ebuild
index a82b3f15595f..a3e8021d0772 100644
--- a/media-gfx/valentina/valentina-0.4.2.ebuild
+++ b/media-gfx/valentina/valentina-0.4.2-r1.ebuild
@@ -50,7 +50,7 @@ src_configure() {
 		fi
 	done
 
-	eqmake5 LOCALES="${locales}" CONFIG+=no_ccache Valentina.pro -r
+	eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r
 }
 
 src_install() {
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index bb08d8f66ef6..6a64afe5c9cd 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 		fi
 	done
 
-	eqmake5 LOCALES="${locales}" CONFIG+=no_ccache Valentina.pro -r
+	eqmake5 LOCALES="${locales}" CONFIG+=noStripDebugSymbols CONFIG+=no_ccache Valentina.pro -r
 }
 
 src_install() {
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 14211cd8bdd6..e82a832c7779 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,3 +1,2 @@
 DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
-DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
 DIST karlyriceditor-2.1.tar.gz 276784 SHA256 1f9ec6717491fac6dda1883dfdbc53d32d6031092b1afa78aa2077a36c54fb97 SHA512 3b07abb9151c745f126c3a8215e94e0d0a00fbf3732c30de7bf47b7013174dfd2d087a4ec2c23bcecf28cd0ba3f5513dd9cb5729ffd486df0bb804a250c24af6 WHIRLPOOL b68389ec853244a00884f3f304c3931cf3c1b97ca80731a4ec5a282ef4065551d14f9e312e47e4196972cbf7357bd8680b8783b887075106cf014be82d0b1d93
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch
new file mode 100644
index 000000000000..7cdc88ae2aa1
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.1-qt55.patch
@@ -0,0 +1,12 @@
+Fix build with Qt 5.5
+
+--- a/src/videoencodingprofiles.h
++++ b/src/videoencodingprofiles.h
+@@ -21,6 +21,7 @@
+ #define VIDEOENCODINGPROFILES_H
+ 
+ #include <QMap>
++#include <QObject>
+ #include <QString>
+ #include <QStringList>
+ 
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild
deleted file mode 100644
index b564adff9553..000000000000
--- a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
-HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl:0
-	media-libs/libsdl
-	>=virtual/ffmpeg-0.10
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-		"${FILESDIR}/${PN}-1.3-libav.patch"
-		"${FILESDIR}/${PN}-1.4-ffmpeg_compat.patch"
-		"${FILESDIR}/${PN}-1.4-qmin.patch"
-		)
-
-src_install() {
-	dodoc Changelog
-	dobin bin/${PN}
-	doicon packages/${PN}.png
-	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
-}
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
index 8b13bcbb75e4..631f6958c41a 100644
--- a/media-sound/karlyriceditor/karlyriceditor-2.1.ebuild
+++ b/media-sound/karlyriceditor/karlyriceditor-2.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$
 
@@ -13,13 +13,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav"
+IUSE="libav qt5"
 
 RDEPEND="
 	dev-libs/openssl:0
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
 	media-libs/libsdl[sound]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
 	libav? ( media-video/libav:= )
 	!libav? ( media-video/ffmpeg:= )
 "
@@ -30,10 +37,15 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-1.11-libav.patch"
 	"${FILESDIR}/${PN}-2.1-ffmpeg3.patch"
+	"${FILESDIR}/${PN}-2.1-qt55.patch"
 )
 
 src_configure() {
-	eqmake4 "${PN}.pro"
+	if use qt5; then
+		eqmake5 "${PN}.pro"
+	else
+		eqmake4 "${PN}.pro"
+	fi
 }
 
 src_install() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c28fcbbdb6fb..f17a5131fa3a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Feb 2016 05:08:20 +0000
+Fri, 19 Feb 2016 11:08:19 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c28fcbbdb6fb..f17a5131fa3a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Feb 2016 05:08:20 +0000
+Fri, 19 Feb 2016 11:08:19 +0000
diff --git a/metadata/md5-cache/app-misc/wcd-5.3.0 b/metadata/md5-cache/app-misc/wcd-5.3.2
similarity index 83%
rename from metadata/md5-cache/app-misc/wcd-5.3.0
rename to metadata/md5-cache/app-misc/wcd-5.3.2
index f96f28e189e8..8d3cefe9c3ae 100644
--- a/metadata/md5-cache/app-misc/wcd-5.3.0
+++ b/metadata/md5-cache/app-misc/wcd-5.3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
 DESCRIPTION=Wherever Change Directory
-EAPI=5
+EAPI=6
 HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
 IUSE=nls unicode
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
 SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.0.tar.gz
+SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e0b88077e1ee616677980788e322c060
+_md5_=a89e6248a423273953eac639bd0d4ec0
diff --git a/metadata/md5-cache/dev-python/attrs-15.2.0 b/metadata/md5-cache/dev-python/attrs-15.2.0
new file mode 100644
index 000000000000..ddb4a926c5dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/attrs-15.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Attributes without boilerplate
+EAPI=6
+HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ http://pypi.python.org/pypi/attrs
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/a/attrs/attrs-15.2.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=af81c1675ab8004a3900b44a2e518d9f
diff --git a/metadata/md5-cache/dev-python/flexx-0.3.1 b/metadata/md5-cache/dev-python/flexx-0.3.1
new file mode 100644
index 000000000000..8bde3c707358
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flexx-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Pure Python toolkit for creating GUI's using web technology
+EAPI=5
+HOMEPAGE=http://flexx.readthedocs.org http://github.com/zoofio/flexx http://pypi.python.org/pypi/flexx
+IUSE=python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/f/flexx/flexx-0.3.1.zip
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ffecf542bddd04b1698a7b50babf6b6c
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.44.1 b/metadata/md5-cache/dev-python/humanfriendly-1.44.1
new file mode 100644
index 000000000000..18cec3613530
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanfriendly-1.44.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/capturer[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coloredlogs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Human friendly output for text interfaces using Python
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-1.44.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=24f88768bd9623b6072d7374750002c0
diff --git a/metadata/md5-cache/dev-python/mccabe-0.4.0 b/metadata/md5-cache/dev-python/mccabe-0.4.0
index fbf3994e8b14..b0d511b0d12b 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.4.0
+++ b/metadata/md5-cache/dev-python/mccabe-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=a plugin for flake8
 EAPI=5
 HOMEPAGE=https://github.com/flintwork/mccabe
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.4.0.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8131239e5dcf25c291c01712f9538f32
+_md5_=347afd6d766b1eaa6914a7f9c43b243c
diff --git a/metadata/md5-cache/dev-python/numba-0.23.1 b/metadata/md5-cache/dev-python/numba-0.23.1
new file mode 100644
index 000000000000..629ca0b8b5b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numba-0.23.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/llvmlite[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=NumPy aware dynamic Python compiler using LLVM
+EAPI=5
+HOMEPAGE=http://numba.pydata.org/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/llvmlite[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/numba/numba/archive/0.23.1.tar.gz -> numba-0.23.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ac0c44193b8efe89f969a2693edf86d9
diff --git a/metadata/md5-cache/dev-python/numpy-1.10.4 b/metadata/md5-cache/dev-python/numpy-1.10.4
index 7997aa36c552..51db5a3bf344 100644
--- a/metadata/md5-cache/dev-python/numpy-1.10.4
+++ b/metadata/md5-cache/dev-python/numpy-1.10.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.10.4.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.10.1/numpy-html-1.10.1.zip http://docs.scipy.org/doc/numpy-1.10.1/numpy-ref-1.10.1.pdf http://docs.scipy.org/doc/numpy-1.10.1/numpy-user-1.10.1.pdf )
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=21a66054bd20adb3718f11d099c85780
+_md5_=452f567c92471b42179f77a55b92a8e6
diff --git a/metadata/md5-cache/dev-python/service_identity-16.0.0 b/metadata/md5-cache/dev-python/service_identity-16.0.0
new file mode 100644
index 000000000000..92de2bd133b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/service_identity-16.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Service identity verification for pyOpenSSL
+EAPI=5
+HOMEPAGE=https://github.com/pyca/service_identity
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/s/service_identity/service_identity-16.0.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=0cee698cb2b15cc29087203145ed9839
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.5.1 b/metadata/md5-cache/dev-qt/qtgui-5.5.1
deleted file mode 100644
index 62c24432805c..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.5.1 media-libs/fontconfig >=media-libs/freetype-2.5.5:2 >=media-libs/harfbuzz-0.9.40:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.5.1 ) egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( x11-libs/gtk+:2 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.5.1 ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.5.1 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 gtkstyle ibus jpeg libinput +png tslib tuio +udev +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.5.1 media-libs/fontconfig >=media-libs/freetype-2.5.5:2 >=media-libs/harfbuzz-0.9.40:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.5.1 ) egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( x11-libs/gtk+:2 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.5.1 ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.4 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=8a083d5a3b51ad35d2bee3e24d2aa517
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.2.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.2.3
deleted file mode 100644
index dfa5002377c5..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-3.0.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.0.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.0.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.2.3.tar.gz -> rspec-core-3.2.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=477a2c601b28aa6fa62c4dac170a7fc8
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.1
deleted file mode 100644
index 48c3447eaae4..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby19] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.1.tar.gz -> rspec-core-3.3.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=953bd30bdb89c14af8994ec1d254feb0
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.4.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.4.1
deleted file mode 100644
index 42dbd05c48bf..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.4.1.tar.gz -> rspec-core-3.4.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dc1934af74aae9b9fdca4690586a89b3
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.4.3
similarity index 93%
rename from metadata/md5-cache/dev-ruby/rspec-core-3.4.0
rename to metadata/md5-cache/dev-ruby/rspec-core-3.4.3
index 6791d45b4f7e..7c20d05c23ab 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.4.0.tar.gz -> rspec-core-3.4.0-git.tgz
+SRC_URI=https://github.com/rspec/rspec-core/archive/v3.4.3.tar.gz -> rspec-core-3.4.3-git.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dc1934af74aae9b9fdca4690586a89b3
+_md5_=a0589a1e833f97268a41c1accb498623
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
new file mode 100644
index 000000000000..1506de74ba9f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] >=dev-ruby/minitest-5.5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] dev-ruby/hoe-seattlerb[ruby_targets_ruby21] >=dev-ruby/minitest-5.5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
+EAPI=5
+HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=4
+SRC_URI=mirror://rubygems/sexp_processor-4.7.0.gem
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=31a708d3e32254fd39fa03f3c5359d8c
diff --git a/metadata/md5-cache/media-gfx/valentina-0.4.2 b/metadata/md5-cache/media-gfx/valentina-0.4.2-r1
similarity index 96%
rename from metadata/md5-cache/media-gfx/valentina-0.4.2
rename to metadata/md5-cache/media-gfx/valentina-0.4.2-r1
index 70e7e6520739..558b12b6e94a 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.4.2
+++ b/metadata/md5-cache/media-gfx/valentina-0.4.2-r1
@@ -10,4 +10,4 @@ RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-q
 SLOT=0
 SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> valentina-0.4.2.zip
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=87979aedf8e7f84b1fec6b2ac60c203c
+_md5_=e0aae56c1e0f750d4727e8ea0fc92784
diff --git a/metadata/md5-cache/media-gfx/valentina-9999 b/metadata/md5-cache/media-gfx/valentina-9999
index 7a4d85b0d0fb..ec8afd4f16aa 100644
--- a/metadata/md5-cache/media-gfx/valentina-9999
+++ b/metadata/md5-cache/media-gfx/valentina-9999
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	mercurial	789038b352d112bcff9dff083aa40d8d	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=348e6bb14f881fa4246843223d4a6649
+_md5_=af9a56e14b6eb02dc44226fdab894e33
diff --git a/metadata/md5-cache/media-sound/karlyriceditor-1.4 b/metadata/md5-cache/media-sound/karlyriceditor-1.4
deleted file mode 100644
index a26e51bc3741..000000000000
--- a/metadata/md5-cache/media-sound/karlyriceditor-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/openssl:0 media-libs/libsdl >=virtual/ffmpeg-0.10 dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/pkgconfig
-DESCRIPTION=Application to edit and synchronize lyrics with karaoke songs in various formats
-EAPI=5
-HOMEPAGE=http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0 media-libs/libsdl >=virtual/ffmpeg-0.10 dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/karlyriceditor/karlyriceditor-1.4.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f431c3a48e28024a7444257b63466a20
diff --git a/metadata/md5-cache/media-sound/karlyriceditor-2.1 b/metadata/md5-cache/media-sound/karlyriceditor-2.1
index 4eac924323d9..e1818631a786 100644
--- a/metadata/md5-cache/media-sound/karlyriceditor-2.1
+++ b/metadata/md5-cache/media-sound/karlyriceditor-2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/openssl:0 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libsdl[sound] libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) virtual/pkgconfig
+DEPEND=dev-libs/openssl:0 media-libs/libsdl[sound] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) virtual/pkgconfig
 DESCRIPTION=Application to edit and synchronize lyrics with karaoke songs in various formats
 EAPI=6
 HOMEPAGE=http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/
-IUSE=libav
+IUSE=libav qt5
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-libs/openssl:0 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/libsdl[sound] libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= )
+RDEPEND=dev-libs/openssl:0 media-libs/libsdl[sound] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/karlyriceditor/karlyriceditor-2.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=355759bda465c48f2d9f819af28c6b5e
+_md5_=0876f197e7eb66489458fe7e4e6c4a48
diff --git a/metadata/md5-cache/net-analyzer/suricata-2.0.10 b/metadata/md5-cache/net-analyzer/suricata-2.0.10
deleted file mode 100644
index 615a4833af99..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-2.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=5
-HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue )
-SLOT=0
-SRC_URI=http://www.openinfosecfoundation.org/download/suricata-2.0.10.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=ebaa526daf686444d8f0cfcb18eab60b
diff --git a/metadata/md5-cache/net-analyzer/suricata-2.0.11 b/metadata/md5-cache/net-analyzer/suricata-2.0.11
index 91163d44a6c3..d4a896d0ae02 100644
--- a/metadata/md5-cache/net-analyzer/suricata-2.0.11
+++ b/metadata/md5-cache/net-analyzer/suricata-2.0.11
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:
 DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
 EAPI=5
 HOMEPAGE=http://suricata-ids.org/
-IUSE=+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test
+IUSE=+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue )
 SLOT=0
 SRC_URI=http://www.openinfosecfoundation.org/download/suricata-2.0.11.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=ebaa526daf686444d8f0cfcb18eab60b
+_md5_=85f262805bf2c7fce6ed2933e86d8633
diff --git a/metadata/md5-cache/net-misc/chrony-2.3_pre1 b/metadata/md5-cache/net-misc/chrony-2.3
similarity index 92%
rename from metadata/md5-cache/net-misc/chrony-2.3_pre1
rename to metadata/md5-cache/net-misc/chrony-2.3
index d778ecb46af0..cfd84f75397f 100644
--- a/metadata/md5-cache/net-misc/chrony-2.3_pre1
+++ b/metadata/md5-cache/net-misc/chrony-2.3
@@ -10,6 +10,6 @@ RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sy
 REQUIRED_USE=?? ( libedit readline )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.3-pre1.tar.gz
+SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=ff874d4bc82803aa0e242bbac94fc589
diff --git a/metadata/md5-cache/net-news/quiterss-0.18.3 b/metadata/md5-cache/net-news/quiterss-0.18.3
new file mode 100644
index 000000000000..f7ffbca914b2
--- /dev/null
+++ b/metadata/md5-cache/net-news/quiterss-0.18.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-db/sqlite-3.10.0:3 dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A Qt-based RSS/Atom feed reader
+EAPI=6
+HOMEPAGE=https://quiterss.org
+IUSE=debug phonon +qt4 qt5 linguas_ar linguas_bg linguas_cs linguas_de linguas_el_GR linguas_es linguas_fa linguas_fi linguas_fr linguas_gl linguas_hi linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sk linguas_sr linguas_sv linguas_tg_TJ linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=dev-db/sqlite-3.10.0:3 dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
+REQUIRED_USE=^^ ( qt4 qt5 )
+SLOT=0
+SRC_URI=https://github.com/QuiteRSS/quiterss/archive/0.18.3.tar.gz -> quiterss-0.18.3.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	d19e7813f27c8f982134d657889b13cf	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5a7142a2200aa6b1ddb38e5736966d94
diff --git a/metadata/md5-cache/net-news/quiterss-9999 b/metadata/md5-cache/net-news/quiterss-9999
index 788ee5eee609..9ece41d48de9 100644
--- a/metadata/md5-cache/net-news/quiterss-9999
+++ b/metadata/md5-cache/net-news/quiterss-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3 dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-db/sqlite-3.10.0:3 dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A Qt-based RSS/Atom feed reader
-EAPI=5
+EAPI=6
 HOMEPAGE=https://quiterss.org
-IUSE=debug phonon +qt4 qt5 linguas_ar linguas_bg linguas_cs linguas_de linguas_el_GR linguas_es linguas_fa linguas_fi linguas_fr linguas_gl linguas_hi linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sk linguas_sr linguas_sv linguas_tg_TJ linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
+IUSE=debug phonon +qt4 qt5 linguas_ar linguas_bg linguas_cs linguas_de linguas_el_GR linguas_es linguas_fa linguas_fi linguas_fr linguas_gl linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sk linguas_sr linguas_sv linguas_tg_TJ linguas_th_TH linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
 LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:3 dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
+RDEPEND=>=dev-db/sqlite-3.10.0:3 dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
 REQUIRED_USE=^^ ( qt4 qt5 )
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=69b05c5d7d0089170dc6d03092fb301f
+_md5_=37e9346828e645781ba9c1dbc74ef2a8
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.12.19 b/metadata/md5-cache/net-p2p/syncthing-0.12.19
index d6cc2e33749c..b63fd20cb5e2 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.12.19
+++ b/metadata/md5-cache/net-p2p/syncthing-0.12.19
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=>=dev-lang/go-1.4.2:= virtual/pkgconfig
-DESCRIPTION=Syncthing is an open, trustworthy and decentralized cloud storage system
+DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=5
-HOMEPAGE=http://syncthing.net
+HOMEPAGE=https://syncthing.net
 KEYWORDS=~amd64 ~x86
-LICENSE=MIT
+LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v0.12.19.tar.gz -> syncthing-0.12.19.tar.gz
 _eclasses_=golang-base	1f6a08c05da2d91150032ff45db6a2c5	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=2ba23a768c9c3205a9a273fd920b2d06
+_md5_=416a1e8e409d28e0d8abd5961a307937
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150420 b/metadata/md5-cache/sys-fs/aufs3-3_p20150420
deleted file mode 100644
index 1fc42a885a5d..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150420
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150420.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150504 b/metadata/md5-cache/sys-fs/aufs3-3_p20150504
deleted file mode 100644
index c3d7c715175f..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150504
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150504.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150511 b/metadata/md5-cache/sys-fs/aufs3-3_p20150511
deleted file mode 100644
index 4b8df7c0937b..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150511
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150511.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150518 b/metadata/md5-cache/sys-fs/aufs3-3_p20150518
deleted file mode 100644
index e2ea4b055207..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150518
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150518.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150525 b/metadata/md5-cache/sys-fs/aufs3-3_p20150525
deleted file mode 100644
index 1def09b6384b..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150525
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150525.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150608 b/metadata/md5-cache/sys-fs/aufs3-3_p20150608
deleted file mode 100644
index 69570ed6d32a..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150608
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150608.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20151012 b/metadata/md5-cache/sys-fs/aufs3-3_p20151012
deleted file mode 100644
index 2fe5ef8cb5ae..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20151012
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20151012.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20151102 b/metadata/md5-cache/sys-fs/aufs3-3_p20151102
deleted file mode 100644
index 62ac63c92223..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20151102
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20151102.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20151109 b/metadata/md5-cache/sys-fs/aufs3-3_p20151109
deleted file mode 100644
index d9ed896813ea..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20151109
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20151109.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20151116 b/metadata/md5-cache/sys-fs/aufs3-3_p20151116
deleted file mode 100644
index 0805a6608da2..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20151116
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20151116.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20151221 b/metadata/md5-cache/sys-fs/aufs3-3_p20151221
deleted file mode 100644
index 307236b4c703..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20151221
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20151221.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160118 b/metadata/md5-cache/sys-fs/aufs3-3_p20160118
deleted file mode 100644
index 438cf09e51e3..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160118
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160118.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=482527b05a2b3ab820bb95d1e54da374
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160215 b/metadata/md5-cache/sys-fs/aufs3-3_p20160215
deleted file mode 100644
index ef08dc8d687d..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20160215
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160215.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=482527b05a2b3ab820bb95d1e54da374
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150406 b/metadata/md5-cache/sys-fs/aufs3-3_p20160219
similarity index 76%
rename from metadata/md5-cache/sys-fs/aufs3-3_p20150406
rename to metadata/md5-cache/sys-fs/aufs3-3_p20160219
index 8c6547d9b4fe..c892482caa5b 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20150406
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160219
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
+EAPI=6
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150406.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e238272dca37d01c0577201b245011cb
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160219.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e2119575c50a915606fa14a61856acf6
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150504 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150504
deleted file mode 100644
index 87345eeced5c..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150504
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150504.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150511 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150511
deleted file mode 100644
index 3eaeb3f391c1..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150511
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150511.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150518 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150518
deleted file mode 100644
index 76fd34fc5262..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150518
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150518.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150525 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150525
deleted file mode 100644
index df15c7fe4112..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150525
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150525.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150608 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150608
deleted file mode 100644
index f51ff50fd83e..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150608
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150608.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150622 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150622
deleted file mode 100644
index b881ca014a4f..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150622
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150622.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150629 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150629
deleted file mode 100644
index f92d8acd2bd3..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150629
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150629.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dcebc3b9157b876c90c38af26e66afe2
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150928 b/metadata/md5-cache/sys-fs/aufs4-0_pre20150928
deleted file mode 100644
index d92cd623f06a..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150928
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150928.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=241714707906ae994356e201dc2e8552
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20151012 b/metadata/md5-cache/sys-fs/aufs4-0_pre20151012
deleted file mode 100644
index 4538d844a681..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20151012
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20151012.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=241714707906ae994356e201dc2e8552
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20151102 b/metadata/md5-cache/sys-fs/aufs4-0_pre20151102
deleted file mode 100644
index 527b831c29ce..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20151102
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20151102.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=241714707906ae994356e201dc2e8552
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20151109 b/metadata/md5-cache/sys-fs/aufs4-0_pre20151109
deleted file mode 100644
index ef18d75461c2..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20151109
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20151109.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=576be4e7385eaf3647e1788bf0179e01
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20151116 b/metadata/md5-cache/sys-fs/aufs4-0_pre20151116
deleted file mode 100644
index c8a96e7b1fe9..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20151116
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20151116.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=576be4e7385eaf3647e1788bf0179e01
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20151221 b/metadata/md5-cache/sys-fs/aufs4-0_pre20151221
deleted file mode 100644
index 38cb2f3ebb48..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20151221
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20151221.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=576be4e7385eaf3647e1788bf0179e01
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160111 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160111
deleted file mode 100644
index 0db11a3be4db..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160111
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160111.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d0c02f7def814a8bf5187ce36ccd6f8f
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160118 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160118
deleted file mode 100644
index 4ece35e371cf..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160118
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160118.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d0c02f7def814a8bf5187ce36ccd6f8f
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160215 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160215
deleted file mode 100644
index d9e23f4a4604..000000000000
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20160215
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160215.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d0c02f7def814a8bf5187ce36ccd6f8f
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20150420 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160219
similarity index 75%
rename from metadata/md5-cache/sys-fs/aufs4-0_pre20150420
rename to metadata/md5-cache/sys-fs/aufs4-0_pre20160219
index 53a40979953c..12a590a5af93 100644
--- a/metadata/md5-cache/sys-fs/aufs4-0_pre20150420
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20160219
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=5
+EAPI=6
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20150420.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f6909ef578512d1414282cfaa6ebf8b
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160219.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=961e0579d11cd876090ac561cdfba5cd
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.25-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.27
similarity index 72%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.18.25-r1
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.18.27
index 8d6fdc699cd0..dd7d158b53cc 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.25-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.27
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND==sys-fs/aufs-util-3*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.25-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-25.base.tar.xz mirror://gentoo/genpatches-3.18-25.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-25.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=60a8d7df13a1d643c8a632bced58f575
+SLOT=3.18.27
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.25+_p20160219.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-28.base.tar.xz mirror://gentoo/genpatches-3.18-28.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-28.experimental.tar.xz ) )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0c99d33ea1a957f3a3967502d2975480
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
deleted file mode 100644
index db3bf19d9b68..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.0 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.0.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-6.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b60af268290a02d521c7afcb5ead8f1d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9 b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9-r1
similarity index 81%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.0.9
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.0.9-r1
index 48eb1ea35fbc..21a711dd33a0 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.9-r1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.0.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20150629.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-11.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d27eefc9d5b55c842573c4c556a08ef1
+SLOT=4.0.9-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20160219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-11.experimental.tar.xz ) )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=76ad3f39e4909acd17a808f4416079db
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12
deleted file mode 100644
index 3e81c3cdc7d9..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.1 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.1_p20151012.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.1-16.base.tar.xz mirror://gentoo/genpatches-4.1-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-16.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f545cfd57ee5fd8178b1359a25ab1167
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.15-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.15-r1
deleted file mode 100644
index ccb20a84d28c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.15-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.1 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.15-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.1_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.1-20.base.tar.xz mirror://gentoo/genpatches-4.1-20.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-20.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f7b9b405613876b968bfcd932a1195d4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.16 b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.16
deleted file mode 100644
index 70378860b556..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.1 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.16
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.1_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.1-21.base.tar.xz mirror://gentoo/genpatches-4.1-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-21.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f27d13c4b1d7456ffff2eccd07e52d1b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.17 b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.18
similarity index 63%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.1.17
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.1.18
index 6f962d766010..3147fbb236ad 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.1.17
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.1.18
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.1.17
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.1_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.1-22.base.tar.xz mirror://gentoo/genpatches-4.1-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-22.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef011c6ebfca7130665fda27fb7ff22b
+SLOT=4.1.18
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.1.13+_p20160219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.1-23.base.tar.xz mirror://gentoo/genpatches-4.1-23.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-23.experimental.tar.xz ) )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=115f7d82a07cf7a2a6d0345bc36fd980
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.3-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.3-r1
deleted file mode 100644
index 1f7d2d32121b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.3 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.3.3-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.3_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.3-5.base.tar.xz mirror://gentoo/genpatches-4.3-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-5.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b7094e69eaee9f12cce788dd299d48d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.4
deleted file mode 100644
index c216f7bdc2ec..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.3 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.3.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.3_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.3-6.base.tar.xz mirror://gentoo/genpatches-4.3-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-6.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=110bfa6f3fe8ef68691eb974cb06a027
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.5-r1
similarity index 77%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.3.5
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.3.5-r1
index 619e1405a045..a0e7ae8b3d95 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.5-r1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.3.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.3_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.3-7.base.tar.xz mirror://gentoo/genpatches-4.3-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-7.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6aaad892c0949c7c90add04293954c36
+SLOT=4.3.5-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.3_p20160219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.3-7.base.tar.xz mirror://gentoo/genpatches-4.3-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-7.experimental.tar.xz ) )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8fc237b7809ff8b1b511ed4f42f1bc24
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.1
deleted file mode 100644
index c3764a82118b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-3.base.tar.xz mirror://gentoo/genpatches-4.4-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-3.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c93027e8e75d7f74f3ed0e38fabe51a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.0-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.2
similarity index 63%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.4.0-r1
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.4.2
index 998c4eb23f00..0529db8e5d77 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.0-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.2
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.0-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160118.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-2.base.tar.xz mirror://gentoo/genpatches-4.4-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-2.experimental.tar.xz ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4867556cbbba45ee8e366de18ffe4955
+SLOT=4.4.2
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-4.base.tar.xz mirror://gentoo/genpatches-4.4-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-4.experimental.tar.xz ) )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b894015e7fde3638dd92d9ca29bc7cae
diff --git a/metadata/md5-cache/www-apps/nanoc-4.1.4-r1 b/metadata/md5-cache/www-apps/nanoc-4.1.4-r1
new file mode 100644
index 000000000000..4b5ad4158493
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.1.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/mocha-0.13[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] =dev-ruby/rdoc-4*[ruby_targets_ruby21] dev-ruby/systemu[ruby_targets_ruby21] dev-ruby/vcr[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby21] dev-ruby/rdiscount[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=5
+HOMEPAGE=http://nanoc.ws/
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby21] dev-ruby/rack:*[ruby_targets_ruby21] www-servers/adsf[ruby_targets_ruby21] ) >=dev-ruby/cri-2.3:0[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/nanoc-4.1.4.gem
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a14bcc02b2cb33641adbe4d9f422c076
diff --git a/metadata/md5-cache/www-client/opera-35.0.2066.68 b/metadata/md5-cache/www-client/opera-35.0.2066.68
new file mode 100644
index 000000000000..7c2fccf0a4f5
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-35.0.2066.68
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+linguas_af +linguas_az +linguas_be +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_en_US +linguas_es_419 +linguas_es +linguas_fil +linguas_fi +linguas_fr_CA +linguas_fr +linguas_fy +linguas_gd +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kk +linguas_ko +linguas_lt +linguas_lv +linguas_me +linguas_mk +linguas_ms +linguas_nb +linguas_nl +linguas_nn +linguas_pa +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_uz +linguas_vi +linguas_zh_CN +linguas_zh_TW +linguas_zu
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/35.0.2066.68/linux/opera-stable_35.0.2066.68_amd64.deb )
+_eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	d19e7813f27c8f982134d657889b13cf	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8715651ba02c469733b6416bbbfa3948
diff --git a/metadata/md5-cache/www-client/opera-developer-37.0.2142.0 b/metadata/md5-cache/www-client/opera-developer-37.0.2142.0
new file mode 100644
index 000000000000..d997a228e6f2
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-37.0.2142.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+linguas_af +linguas_az +linguas_be +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_en_US +linguas_es_419 +linguas_es +linguas_fil +linguas_fi +linguas_fr_CA +linguas_fr +linguas_fy +linguas_gd +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kk +linguas_ko +linguas_lt +linguas_lv +linguas_me +linguas_mk +linguas_ms +linguas_nb +linguas_nl +linguas_nn +linguas_pa +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_uz +linguas_vi +linguas_zh_CN +linguas_zh_TW +linguas_zu
+KEYWORDS=~amd64 ~x86
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/37.0.2142.0/linux/opera-developer_37.0.2142.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/37.0.2142.0/linux/opera-developer_37.0.2142.0_i386.deb )
+_eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	d19e7813f27c8f982134d657889b13cf	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=356f3a966652b3d585d192f316210208
diff --git a/metadata/md5-cache/www-servers/adsf-1.2.0 b/metadata/md5-cache/www-servers/adsf-1.2.0
new file mode 100644
index 000000000000..1c8247efe1c8
--- /dev/null
+++ b/metadata/md5-cache/www-servers/adsf-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A Dead Simple Fileserver is a static file server that can launch in a directory
+EAPI=5
+HOMEPAGE=http://nanoc.stoneship.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=https://github.com/ddfreyne/adsf/archive/1.2.0.tar.gz -> adsf-1.2.0.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9f41d033e6a0e46fdf8227c1b2b35ec5
diff --git a/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0 b/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0
new file mode 100644
index 000000000000..945fd9318c90
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/smplayer-themes-15.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-qt/qtcore:4
+DESCRIPTION=Icon themes for smplayer
+EAPI=6
+HOMEPAGE=http://smplayer.sourceforge.net/
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3
+RDEPEND=media-video/smplayer
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smplayer-themes-15.12.0.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=3fc3c07cdd2ae29bd212997d499fe50f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c28fcbbdb6fb..f17a5131fa3a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Feb 2016 05:08:20 +0000
+Fri, 19 Feb 2016 11:08:19 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 31f4c863a860..b3a6289ab922 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Feb 19 05:07:31 UTC 2016
+Fri Feb 19 11:07:29 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 79c9a3b67ece..1755037e0e24 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Feb 2016 05:30:01 +0000
+Fri, 19 Feb 2016 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3c158e351003..c54523a74777 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1455858301 Fri 19 Feb 2016 05:05:01 AM UTC
+1455879901 Fri 19 Feb 2016 11:05:01 AM UTC
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index e35b5b90b2e4..cff174945383 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,2 +1 @@
-DIST suricata-2.0.10.tar.gz 3090730 SHA256 c8d1d3b6ce3d2a56577fca224424071afd921739d3859efc8a62229556d4beef SHA512 fa3683a93d85b26166b0f67a85f1a498941aadf4372ef98bd7fe62fcdef150af46b65456e3a764e054c385abbf44138ae6f70882c68ba320508eade6e181f2c6 WHIRLPOOL b867003e76df2b0b1b56c89415ed96acbf9d8966739d77aa303055d29ae5cdad8ad0b58e969336f0c1fc2e5d9990941622c19c062828dae58bf062f5662225f3
 DIST suricata-2.0.11.tar.gz 3091124 SHA256 c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e SHA512 659e893fef3cdcca8440f2af7596d5cc58b142d3350b9ea5ba57d855c6759a00adafeb15a1dfe91dd55eca1437487eb4e842b4e2913d12417f0b906ca3d54ec9 WHIRLPOOL 5cfa55abd90284a0a3441853af9db18075a23fa5661d89448b409b8fdd1031ad348d76d455b7dfe7b2688e69633f5bbb65dc060cc2426af017ab1bcb824c9ac5
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 9ec4bf7286c8..0f80bed1d8da 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -8,6 +8,7 @@
     <flag name="af-packet">Enable AF_PACKET support</flag>
     <flag name="control-socket">Enable unix socket</flag>
     <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+    <flag name="detection">Enable detection modules</flag>
     <flag name="luajit">Enable Luajit support</flag>
     <flag name="nflog">Enable libnetfilter_log support</flag>
     <flag name="nfqueue">Enable AF_PACKET support</flag>
diff --git a/net-analyzer/suricata/suricata-2.0.10.ebuild b/net-analyzer/suricata/suricata-2.0.10.ebuild
deleted file mode 100644
index 3c69998a1b55..000000000000
--- a/net-analyzer/suricata/suricata-2.0.10.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="http://suricata-ids.org/"
-SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test"
-
-DEPEND="
-	>=dev-libs/jansson-2.2
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	net-libs/libpcap
-	sys-apps/file
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/geoip )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-"
-# #446814
-#	prelude?    ( dev-libs/libprelude )
-#	pfring?     ( sys-process/numactl net-libs/pf_ring)
-#	system-htp? ( >=net-analyzer/htp-0.5.5 )
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fortify_source-numeric.patch"
-	epatch "${FILESDIR}/magic-location.patch"
-	epatch "${FILESDIR}/json.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var/" \
-		"--disable-detection" \
-		$(use_enable af-packet) \
-		$(use_enable nfqueue) \
-		$(use_enable test coccinelle) \
-		$(use_enable test unittests) \
-		$(use_enable control-socket unix-socket)
-	)
-
-	if use cuda ; then
-		myeconfargs+=( $(use_enable cuda) )
-	fi
-	if use debug ; then
-		myeconfargs+=( $(use_enable debug) )
-	fi
-	if use geoip ; then
-		myeconfargs+=( $(use_enable geoip) )
-	fi
-	if use hardened ; then
-		myeconfargs+=( $(use_enable hardened gccprotect) )
-	fi
-	if use nflog ; then
-		myeconfargs+=( $(use_enable nflog) )
-	fi
-	# not supported yet (no pfring in portage)
-# 	if use pfring ; then
-# 		myeconfargs+=( $(use_enable pfring) )
-# 	fi
-	# no libprelude in portage
-# 	if use prelude ; then
-# 		myeconfargs+=( $(use_enable prelude) )
-# 	fi
-	# htp not added into portage yet
-# 	if use system-htp ; then
-# 		myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
-# 	fi
-	if use lua ; then
-		myeconfargs+=( $(use_enable lua) )
-	fi
-	if use luajit ; then
-		myeconfargs+=( $(use_enable luajit) )
-	fi
-
-# this should be used when pf_ring use flag support will be added
-# 	LIBS+="-lrt -lnuma"
-
-	econf LIBS="${LIBS}" ${myeconfargs[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/etc/${PN}"
-	doins {classification,reference,threshold}.config suricata.yaml
-
-	if use rules ; then
-		insinto "/etc/${PN}/rules"
-		doins rules/*.rules
-	fi
-
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-}
\ No newline at end of file
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
index 3c69998a1b55..250c663dbd21 100644
--- a/net-analyzer/suricata/suricata-2.0.11.ebuild
+++ b/net-analyzer/suricata/suricata-2.0.11.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$
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
 
 DEPEND="
 	>=dev-libs/jansson-2.2
@@ -54,8 +54,8 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		"--localstatedir=/var/" \
-		"--disable-detection" \
 		$(use_enable af-packet) \
+		$(use_enable detection) \
 		$(use_enable nfqueue) \
 		$(use_enable test coccinelle) \
 		$(use_enable test unittests) \
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 487b9dba5c2c..4ed75be1b452 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,3 +1,3 @@
 DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce
 DIST chrony-2.2.tar.gz 340285 SHA256 d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 SHA512 40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 WHIRLPOOL 0f517914935b150bce9a42507f1c4b04ec50d9406d1ac504b396abbe0646a3bce21299cb6b946159e7369800bbcd106257bf2c02e544fffd19d8211f232ed469
-DIST chrony-2.3-pre1.tar.gz 351989 SHA256 828644968d15d030c8a3aa8562229a29b4502a21b7c8d96f7124c3a33ea59100 SHA512 321d714f5d7b085198ad516bdc77a41d9243c84a80ec584af9bccbee4d46e4008885d6ff9e1e46a49e0eb1ea507ce0814df5e98dc06ba8ef1246f52bf57a1dca WHIRLPOOL 03bbff5c502e9eb48925c1504a386b327c785fcc1aeab4f4a9e5e90c60ad592356bbcee3ccc8c565bb3d17891448dd8f33b8515095dc01b148ef793f0c5966a8
+DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920
diff --git a/net-misc/chrony/chrony-2.3_pre1.ebuild b/net-misc/chrony/chrony-2.3.ebuild
similarity index 100%
rename from net-misc/chrony/chrony-2.3_pre1.ebuild
rename to net-misc/chrony/chrony-2.3.ebuild
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index eae07cf8c555..05be2f0daba3 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -2,3 +2,4 @@ DIST QuiteRSS-0.16.2-src.tar.bz2 3645410 SHA256 794d0290048b713fe24e2db6967ac3f9
 DIST QuiteRSS-0.17.6-src.tar.bz2 3832771 SHA256 b14c715755ff6a1a4fa39b1d3efae893835fde07a23e69275fc12fa742cc8e7d SHA512 c6b16bfd7003e343768793a2d972ca9dfa9402c3ce923f0db501249b9f0826707763652ff6f7a37882e9151215245803b0dd6a25781ba5fa166c4594d59d847f WHIRLPOOL 1ae970d36c76f54bf92afd422fc33b5248f4b828c04df2b5705853ded45790ef1bb56711fdb1feec9eee3749abfaea4f569a1ae5ca6bbec1eb8238fd396800fe
 DIST quiterss-0.17.7.tar.gz 5356077 SHA256 5deeeb3fffba57dcc4d9f98d3be15b605549301462388107c45aba222889896c SHA512 ddee530789890fa4462f42fec139fd2dab3cff2f32f27dd49f8b8873ecf2f187731c92adc7804955e6f27cc7f399823f1847b62286aa12268deb8a5192977797 WHIRLPOOL bc7cd42f38a8d7c505af8abb566717bf66d0beef7a5cb709b78b27bce9ac048f5be66705df2eaf426b6669c46c87fbc61aea88b539314cec57226e194bee40fd
 DIST quiterss-0.18.2.tar.gz 3061821 SHA256 7c934c1e2a531662277164765fa4ddc18f691c6a5de3240fd2c2c5cfd95b4d75 SHA512 e55e6a4c52ce19c976e7a47007557d31471a520d896ceddffc6475a75ccef1541960311c175daeeb93a9a395fff33e8bbf6b7dee3e657c465b2c4a0fd91b6531 WHIRLPOOL cdf50c06e17fe20e6fe7f26500ca05f48cdefeaab4c6e3fb354407fe37f9b35051da4bf1e9fe2beea6156deaf9913dcce1ef404d33e6d62211edb6e8502702e6
+DIST quiterss-0.18.3.tar.gz 3331546 SHA256 12f80ae4fb3e4936a6c75ae4561168a17f0817fcd7c3629ec38533e839d89028 SHA512 6b2eadc5ad7beb085772d82fd1f4917e9c2206d44c573709c37e932934688dcdac4b2db7a4ce3f3b51afe8c27326676ecde4d3ee8173e68c2a4ed7bc02696fb5 WHIRLPOOL b725de0defe801bd33746c4f26a071571ba482476393d00ce9e223be7dca750d8420328141bbbd3a2a2421f33c74bfc8a8c8fc66d6958df266f8f1b89880a23f
diff --git a/net-news/quiterss/quiterss-0.18.3.ebuild b/net-news/quiterss/quiterss-0.18.3.ebuild
new file mode 100644
index 000000000000..3e826036f1f8
--- /dev/null
+++ b/net-news/quiterss/quiterss-0.18.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="ar bg cs de el_GR es fa fi fr gl hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
+inherit eutils l10n fdo-mime gnome2-utils qmake-utils
+
+DESCRIPTION="A Qt-based RSS/Atom feed reader"
+HOMEPAGE="https://quiterss.org"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug phonon +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND=">=dev-db/sqlite-3.10.0:3
+	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
+	qt4? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtwebkit:4
+		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS CHANGELOG README.md )
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
+	}
+
+	default
+
+	# dedicated english locale file is not installed at all
+	rm "lang/${PN}_en.ts" || die
+
+	l10n_find_plocales_changes "lang" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do my_rm_loc
+}
+
+src_configure() {
+	use qt4 && eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 \
+		$(usex phonon '' 'DISABLE_PHONON=1')
+	use qt5 && eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index 0554f11fa41f..b2ece1097ce4 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.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
-PLOCALES="ar bg cs de el_GR es fa fi fr gl hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
+EAPI=6
+PLOCALES="ar bg cs de el_GR es fa fi fr gl he hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ th_TH tr uk vi zh_CN zh_TW"
 inherit eutils l10n fdo-mime gnome2-utils qmake-utils
 
 DESCRIPTION="A Qt-based RSS/Atom feed reader"
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="debug phonon +qt4 qt5"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND=">=dev-db/sqlite-3.10.0:3
 	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
 	qt4? ( dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -48,7 +48,7 @@ src_prepare() {
 		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
 	}
 
-	epatch_user
+	default
 
 	# dedicated english locale file is not installed at all
 	rm "lang/${PN}_en.ts" || die
diff --git a/net-p2p/syncthing/metadata.xml b/net-p2p/syncthing/metadata.xml
index f48302ad6b55..78bfd3011c54 100644
--- a/net-p2p/syncthing/metadata.xml
+++ b/net-p2p/syncthing/metadata.xml
@@ -14,7 +14,12 @@
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <longdescription lang="en">
+	  Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized.
+	  Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
+  </longdescription>
   <upstream>
     <remote-id type="github">syncthing/syncthing</remote-id>
+    <bugs-to>https://github.com/syncthing/syncthing/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/net-p2p/syncthing/syncthing-0.12.19.ebuild b/net-p2p/syncthing/syncthing-0.12.19.ebuild
index f6a31e49ccb6..7e4f29a9e895 100644
--- a/net-p2p/syncthing/syncthing-0.12.19.ebuild
+++ b/net-p2p/syncthing/syncthing-0.12.19.ebuild
@@ -9,11 +9,11 @@ EGIT_COMMIT=v${PV}
 
 inherit golang-vcs-snapshot systemd user
 
-DESCRIPTION="Syncthing is an open, trustworthy and decentralized cloud storage system"
-HOMEPAGE="http://syncthing.net"
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
 SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 782da34f3999..95e220f6f322 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5142,6 +5142,7 @@ net-analyzer/snort:zlib - Enables HTTP inspection of compressed web traffic. Req
 net-analyzer/suricata:af-packet - Enable AF_PACKET support
 net-analyzer/suricata:control-socket - Enable unix socket
 net-analyzer/suricata:cuda - Enable NVIDIA Cuda computations support
+net-analyzer/suricata:detection - Enable detection modules
 net-analyzer/suricata:luajit - Enable Luajit support
 net-analyzer/suricata:nflog - Enable libnetfilter_log support
 net-analyzer/suricata:nfqueue - Enable AF_PACKET support
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index dfcfa4b20b06..928212f14d80 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,15 +1,2 @@
-DIST aufs3-standalone-3_p20150406.tar.xz 2863952 SHA256 e2de4fcdb086ab33bc182b084bf534891cc31a7d3ffc805d40dc087c37ab464b SHA512 c843999798f99fef5c16232935606ca438774104dc04c58982bb2b3f9ae371d9f2173b5454d366481de22fd3e658ee9e67f6981504c5c8157af20a8f15f269d1 WHIRLPOOL 0d2efaa6918c6f90339cae02a9ef3908921e8d1903364aaff9af034262f439886a02a639f9eaae27a28093fc6bf451bbc9fe7072a766a36e51f75c779378095d
-DIST aufs3-standalone-3_p20150420.tar.xz 2864092 SHA256 0f592b3c84b149d0842c518b83656be61a627f5bb9c953b824fd1631e24a2224 SHA512 ad383f37c5201a6a6e53e91f18d63648b3768b8327f07c36a207eb90b63b13779709a0f18696896c833866a30e1010c70ad8aa1259ae08dca5465a68f91d48e5 WHIRLPOOL 029f0cb665e0aa5f8d8bc2a93177e73d8ee7d80d68326f4f38018cec5678ff70378e70473f48bde1ba4f8096331eae4e40949b7c732f22789d09c690cd5cfce7
-DIST aufs3-standalone-3_p20150504.tar.xz 2886004 SHA256 f88435f8fa5d0316a5d87cc8c99012a5504e4f52deee518ae6d4b48152a38071 SHA512 acb863eb197a089e7720237f4b1f1a28be150eee751cb6930e16d96053c1dee84333479ac5f2e5eee2107fe73f9563fe4864c01d07a9de452cff1b7fd283844c WHIRLPOOL d6dcea3e86d0eb5636fe6026c9d8e887e8c15283f364aaf41fe1b7eb4ebfe51caae8dcad26162353e90a28e27587a777fa6d7d6e710c1d1006f2b597bd39c06e
-DIST aufs3-standalone-3_p20150511.tar.xz 2940252 SHA256 c3f67eff4fa23a1734e94733d7d7f9e7be1564525e70c8207995a02f96c75ab3 SHA512 c66c6450596f5f5dd6223b7945cbd5a6bf8117c2c0c98547a7debae6e78965cce1cc5e681d60efa798f93f94f67c0129c5372d9fbcbd313abfc5a6bbf89d28df WHIRLPOOL e56fbac3edff29bcc2653683ceaa6e94f18f0764d435e454e981b9f728b03a7cb7562f5a1005455a764cfaf001c7db87d3b74e9a433165d51d53097f45f9cf75
-DIST aufs3-standalone-3_p20150518.tar.xz 2967016 SHA256 f938bdcc461dacf2b59c807b31fca70f166007a3973c50076b60c6d2e53b163c SHA512 7aede4db3135949a7f3098a29ff9234e21eb78534c0aec3b8fdcd63782110f48c76734752857bd157b29cbd16fdb7e844cc50992e4750cfb05ccfba2d9247b64 WHIRLPOOL bdf559b43d2cede70c334621574f62f123a481cefbec091f3e9e3bd12a499ea985e885a941e24634c2d8e9e9a83acb2c149da29038db00562824647ca6e8db78
-DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174afaa347c4f9e9414200899b5c43a8ec0b91c7d03 SHA512 ea6031ff9231ce68b95450e428989ad81b1c6ce4a9a21f718f73dbafd3aa1e12191d7abd57829e0f80cc0cf0aa412e35b2cad4e14430078b88b2e17312d7b708 WHIRLPOOL 81aeff069ebc6122856c74fcdd38784bd7a231c99726a73ddaad04f145978053fd3ff8b788ac0995fa261cfbf62d461c43f8dca887525df887fdb0011a417f40
-DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad
 DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
-DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
-DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a WHIRLPOOL 1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b
-DIST aufs3-standalone-3_p20151109.tar.xz 3151124 SHA256 1fe9341fe93a469d3a17604c90f949304e035e687f1fc3fac4c9f76d93b9535d SHA512 3f3e018e5236e6e8d67c3d0dd13eb38dd9d72ec32c0e572bb9f3b4fb85b4ee7d9d50a5cf63bb6432c5625e8d98655e3f0c228bd66b79fae680dbe866553cbc40 WHIRLPOOL 28d853afe21c8ce5a1ae9a9b5394db87b823bd791e14c5c5d15f3943ff3c67b0ce2bf28b2287f4ce9fc79feeb44127f9a26ba888a8449859b9414880d6748762
-DIST aufs3-standalone-3_p20151116.tar.xz 3164412 SHA256 6702030b4a90b168d8ee227856caeaf999eec91e83bf96517d93cb1242d98ccd SHA512 40bdb947fd3da48d1d245c18cad3a23f61301e596e3b2b9b82b9915c239941af0b55c8491b408c66c07721385de365093601f764b43f096a432d76452f9d76e1 WHIRLPOOL e07ac272cc37eb74776b93030f3a201c8e2e0a7e73777c7e1140a41c83ac58b1e8c77fc4d52dfe9027d10442b5f6a1f11ea1a35a3b36ce8d87bd725f48cb5c3d
-DIST aufs3-standalone-3_p20151221.tar.xz 3174536 SHA256 2f84b85466244e11607680a9cc905f60c56fa4478c4b310366044999819ff58f SHA512 dadc95eea30c2e13ca0f4c316a5aa2a3ff7f8025eb7123a483713ee844a3f0eabe29ddd4c5497e368ba1b0f01008d3578f745eb0bdf5210fb71d2dd4ef54a711 WHIRLPOOL b6f2bde1de90074a238984d72041e27a6d8c7dfc828c055ebce9325d18c35b212770eae6a2ff619ad2b6e176d2833cdd9a184488fd0eb63acb15e5fece608bd6
-DIST aufs3-standalone-3_p20160118.tar.xz 3174824 SHA256 fc9d23a7769a44f0cf91020a5ca70d0fd25890d420ef8db52061610d5db39ad1 SHA512 91e5ad1bb1263a5a6ac48c2c91db75d79ece809f7571a24d8c324154a43cb202996d3534b7e6cc382b55790453dd5209fe841051e3525734c532f183415211b6 WHIRLPOOL abd6490808cd86fb65e5eb2469611799191eb9f36b75ab0c655c2a4cdd8cbe6b5d7341f6631fd97ba9af9f30cab0edc8934c038dc1fdef79042625761afe3f4d
-DIST aufs3-standalone-3_p20160215.tar.xz 3220152 SHA256 e1e468e799826a128ab9ffb5b15dade4c721a4703ffff522f305de91d7b81489 SHA512 ff57fe257575bd217622b408e89daaff1dad0954c2c0a599d4d4117f190a0b59aee9ac9c39f9b6d820604108fa2643d84833e78848cc12e0ea4b84e0dd9e9c7a WHIRLPOOL fa1037e6411c928b99e92e75a7b11aeb5acc0e5c31c45c05cdf21f3368f75fa4ccca199687964fb61ee50927a9df274ea624ea7b363600a4a943cfc171a417cc
+DIST aufs3-standalone-3_p20160219.tar.xz 3256736 SHA256 23652c6d8fd12a9a29454293f13add7e0f97f2ec542b69e5dfecbc99064c4247 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af WHIRLPOOL 1ed7042c9e1e8efc29fa36fcbd2f09a10ffa51cc9d6b349869f6f6947ed27399deb2fa1035df7dbaf69dcbfa7eddb6f240b934a343732ace26f77bcf2e72167a
diff --git a/sys-fs/aufs3/aufs3-3_p20150406.ebuild b/sys-fs/aufs3/aufs3-3_p20150406.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150406.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150420.ebuild b/sys-fs/aufs3/aufs3-3_p20150420.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150420.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150504.ebuild b/sys-fs/aufs3/aufs3-3_p20150504.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150504.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150511.ebuild b/sys-fs/aufs3/aufs3-3_p20150511.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150511.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150518.ebuild b/sys-fs/aufs3/aufs3-3_p20150518.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150518.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150525.ebuild b/sys-fs/aufs3/aufs3-3_p20150525.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150525.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20150608.ebuild b/sys-fs/aufs3/aufs3-3_p20150608.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20150608.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151012.ebuild b/sys-fs/aufs3/aufs3-3_p20151012.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151012.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151102.ebuild b/sys-fs/aufs3/aufs3-3_p20151102.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151102.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151109.ebuild b/sys-fs/aufs3/aufs3-3_p20151109.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151109.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151116.ebuild b/sys-fs/aufs3/aufs3-3_p20151116.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151116.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20151221.ebuild b/sys-fs/aufs3/aufs3-3_p20151221.ebuild
deleted file mode 100644
index 9930d1ec65b1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20151221.ebuild
+++ /dev/null
@@ -1,172 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160215.ebuild b/sys-fs/aufs3/aufs3-3_p20160215.ebuild
deleted file mode 100644
index e98fe7f05fa8..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20160215.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=19
-# highest supported version
-KERN_MAX_VER=20
-# lowest supported version
-KERN_MIN_VER=14
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs4"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
-	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".1+
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs3"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20160118.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild
similarity index 72%
rename from sys-fs/aufs3/aufs3-3_p20160118.ebuild
rename to sys-fs/aufs3/aufs3-3_p20160219.ebuild
index e98fe7f05fa8..6e88f13f894a 100644
--- a/sys-fs/aufs3/aufs3-3_p20160118.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20160219.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
 
 AUFS_VERSION="${PV%%_p*}"
 # highest branch version
@@ -12,7 +12,7 @@ PATCH_MAX_VER=19
 # highest supported version
 KERN_MAX_VER=20
 # lowest supported version
-KERN_MIN_VER=14
+KERN_MIN_VER=18
 
 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -42,21 +42,24 @@ pkg_setup() {
 	use nfs && CONFIG_CHECK+=" EXPORTFS"
 	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
 	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
 
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
 
 	get_version
-	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
 	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
 
 	linux-mod_pkg_setup
 
 	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
 		PATCH_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
-		PATCH_BRANCH="${KV_MINOR}".21+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".25+
 	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
 		PATCH_BRANCH="${KV_MINOR}".1+
 	else
@@ -76,19 +79,30 @@ pkg_setup() {
 			;;
 	esac
 
-	pushd "${T}" &> /dev/null
+	pushd "${T}" &> /dev/null || die
 	unpack ${A}
+
 	cd ${PN}-standalone || die
+
 	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
 	einfo "Using ${module_branch} as patch source"
 	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
 		if use kernel-patch; then
 			cd ${KV_DIR}
 			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
 			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
 			ewarn "You need to compile your kernel with the applied patch"
 			ewarn "to be able to load and use the aufs kernel module"
@@ -99,13 +113,15 @@ pkg_setup() {
 			die "missing kernel patch, please apply it first"
 		fi
 	fi
+
 	popd &> /dev/null
 	export PKG_SETUP_HAS_BEEN_RAN=1
 }
 
 set_config() {
 	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
 		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
 	done
 }
@@ -129,15 +145,11 @@ src_prepare() {
 	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
 	use ramfs && set_config BR_RAMFS
 
-	if use pax_kernel; then
-		if kernel_is ge 3 11; then
-			epatch "${FILESDIR}"/pax-3.11.patch
-		else
-			epatch "${FILESDIR}"/pax-3.patch
-		fi
-	fi
+	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
 
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
 }
 
 src_compile() {
@@ -155,18 +167,19 @@ src_compile() {
 src_install() {
 	linux-mod_src_install
 
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
+	use doc && dodoc -r Documentation
 
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
 
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
 
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 	linux-mod_pkg_postinst
 }
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index a864b8488088..e8b933e4bb61 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -1,17 +1 @@
-DIST aufs4-standalone-0_pre20150420.tar.xz 424360 SHA256 b570006f74faffa91906091ae07dd0441b57f0a1b90f3cbce3585d2b601c98b8 SHA512 51aff25489299e3c59457eea6076e15fb1179233292ad799b4b755368925500fe57fd336361f0cfe7f2d3b8d5469693c1049b8528038a5f0f1baa07b665af9ac WHIRLPOOL 7bd4f604613b3afa94b57eb273fa074334aa0273d21b9db139c8ad13e138defe9f86334d0784c2c3072f86cfcbdcaa5baaea621e72550524248ec1a733dba9e1
-DIST aufs4-standalone-0_pre20150504.tar.xz 466636 SHA256 b14bba141ead117ff9193a8a896a2bcefc418e11e642eb8547d4785833d70261 SHA512 c1299eb6ca179e60e60be2f7792001e2277f9507fd416994abd41c43e066be46ea508eaface45740153e4c34ccfcdcb3aa6a6118c840786fb1abf5aa56d6cc63 WHIRLPOOL 37bf469947c8ef5e0724e37fa40ec9535ff4065f81e64d45d924c16bb1d059d526ae853d0a73cd67de2aeacd3c41444a3a51545e9a12d08c0b8b27b526fa4dff
-DIST aufs4-standalone-0_pre20150511.tar.xz 501548 SHA256 a26e5e684c1878d0bd8e18c512979a6d0cccd9b1c8219746fe3d93ab1448f1be SHA512 da123ea8da38c840de76201284bf6846d794421e38e6193206ac753380eab3ecea33724c23c7b25d62f933c0c3d1e67082d17c1e702eefdb24c722808b88a69d WHIRLPOOL c7d2c81119933a55f0aa357fbc840f4a60597144386150c45260f2c7b99a0722d362595558df4b0db146c0fe65fb6886b002186e15a5e8cea00b3a04075a5500
-DIST aufs4-standalone-0_pre20150518.tar.xz 515624 SHA256 e2c2aeb02dce4f2b15da8459e92e90896c0fc795d6df829e2cab4eb2a82174a1 SHA512 4188d4d7928e1ee8ce88a7a079ee75c0ab9695c3e23db66952ff9d276ad3cfa5dbed1585dabe05856c5f3417d436fa3a1f93645ee68ebaa65a21610de8e34aca WHIRLPOOL 013672a12293ffe9067013d0295f6d797fafafa9f1ca49eb37a831fb77addac52dee804b9c809eadf4d18205a81e419be0b0b273d875a0f04e657498ccf95af8
-DIST aufs4-standalone-0_pre20150525.tar.xz 523720 SHA256 39abd01774e92eb717af89c57797601073c9237554d7e29ec509c7f61629a1e5 SHA512 3856eb2ca8bef3f0f54a8ea87ddb97c367cb96b10efff68b6edda7be1ec95a87742e1328e3d15f2c7a578659c9017187263c4e5371b602448d7ab5defdce43c2 WHIRLPOOL b5a91d900910bab24ccd01cc7b9626fd23cc92fdaf054f669e0fe2cefb5784065703b422a69379eda85d36c63cb8e9dc3a8018cdd277a85bab6886e68c62d60a
-DIST aufs4-standalone-0_pre20150608.tar.xz 532144 SHA256 8aaa1f348de3b6cfa86f21539d0ec44e5d0d18c27f0645719e3140462522a4e7 SHA512 1abd663b5f7997b93a865bf478c2900a3f69aff1d25149be683f8fd0f7362eaeccb7cdd9ce91ff08d1c4f2660414e03b7c9170fb7818c0839176b94c720d2896 WHIRLPOOL 36fa2691e8f5f27be41463c67df10d0e467892151e50df6f8396293c2572ad3d9229f00302bc47d816b48a08bdb64c92926381ba9d00c150dfb9f445dba8aeeb
-DIST aufs4-standalone-0_pre20150622.tar.xz 543932 SHA256 28de7f6968c62a48b78f4b6c9234dd4b7b134632e1d4e7d50e87da9e05c06343 SHA512 82f130ed3b43e2bfe42079c96dca70e868d7ce1df5511f68e7b85d343105d452c334fe7a15c1cd4e01450ca39dd527123c060b98b396d13c4250541ec464c2fc WHIRLPOOL e46a01857f2cbd52e6a3717bc5d076197443146fa9eab3b542aeb2698da652a45e8d40e1f9f50d9d4c3fc34d9a6da225712ac32f27f15eded4e8e3f23e113de8
-DIST aufs4-standalone-0_pre20150629.tar.xz 547808 SHA256 7c1d9a815c73e8cb1c9f909eee8f6945486c8e8feeea9cae4b3865b6032f17e5 SHA512 b7c734fb83515790b58a81b904acb286ef52124e0799dad1c7900dc8af3e0dc6f2875ba86805f1f39b8d04ce6660bf0c0307e4bbc1b58f2ca6171ead5e668a94 WHIRLPOOL b39f2cdeffd20b636c4a3aa5ec8e87cd6b1c8bdfdab071d1cabf53e10629beebffc919abf5fc90915ec0c14f4b4c45a510bbd303765564348a0e2d1688ddf79b
-DIST aufs4-standalone-0_pre20150928.tar.xz 649700 SHA256 614a7d36577d9c432deba647ae925a05f05468fcf9af54c84c553ee9f4b4ccb8 SHA512 69182e8ef0cd8bb251bd579e18aea1fdc5b38d16f9bd8a7dd23eaf84ae86bb24dd011871f90a0d0c1434a6136b9dcc70ed07b6f8301344d13083cd6a755c75ba WHIRLPOOL b43eb05904917f74ea38bd148543552dc1d40eb590cf5059a884dcba909e76943cb9e2d1b873300701ffbc6061beeb3efb76f8014e08a8742c48c38cd6c5fe53
-DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c9412b5c714645739beea9471db421d76f1af2af86d83 SHA512 abf1833a4902dc95cce203607cd715b6794b13e064c073139bc06facfd86ceb817d00d7bed0f5420d8f8f7c9205524a8ffc9431dc1c0d2da1e73393b7d89d33d WHIRLPOOL a8cb9e8fc4449dbc54e1bfab1c9acb61e7dc31c33c62d8a2e2feb407bc6d4a2ceb502fd85ac7519af1e9b028603525ee26763438e04736fee138420796c13e90
-DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49e485bf4f20cb911c71c8d5363ef2986733cb3d9ef SHA512 b4973078f31c50bb58afeb4fc5216a34d31b1dd4de60a5dd172962935becad60820146e22e39e88fc16a4c7a74e21923f02a77d6b0d8cd8aeef946806ed97932 WHIRLPOOL e04651079f1f04a74c330786ff3bbe72c367657ad8d0351ce251a4287ddee65231df410436f86474e6418b3e848eaa370f930376a2a1ad9fe57280b4d75be4cb
-DIST aufs4-standalone-0_pre20151109.tar.xz 697760 SHA256 6dc6341cf729106d0f53b36f100c8d561992985f8dd8000a0956d716b10321a9 SHA512 dcacf98040bd51ad974582e1129b1993d8945b19449dd1e9ce855a5eb1502b05ab67196fa0f61e10eb45a3496d9866c0137122486ef9021704a59a41a7ffa944 WHIRLPOOL 2fd61080044b11f05514d55c9edabb345109cd217a7fcafdae3cc9c2cf8322a998da0f6416e20782ae9dfebd9483d7d87c3280bdf86d718bc2df993e11f2925a
-DIST aufs4-standalone-0_pre20151116.tar.xz 741280 SHA256 362d56dac519b35e73cb93b0ed61442e9cfd01da463ab92579f7e231543dec66 SHA512 425adac57115b61af0d0db713cf60dfbd2820464b4e9beae84ae14bb2e37d99b4e940a67c82aae1fb7b1693a4c812e606239e7f7b254d62105da14973200b40e WHIRLPOOL 5d336ba26ffc4a9daa2675f28d88b53a306224bc42b2751f3cbe7d1fa2c34d93fb0babec82ff6aa844de56cfc5ddda17fc9deb5f1e6d43efc4b3a19389096be0
-DIST aufs4-standalone-0_pre20151221.tar.xz 782884 SHA256 7871f3159418956ab7498df800cf082c55ea84af82720c2fe254cfe0ddbb090f SHA512 a0f5e0af490209b3ac76bcb8c2ac31dcff05d881b9dad314c701ac84b990c26b0b5beb59f36ce5e373b6548052eeda1389bd8ba39a5be15b9eeea13dfc9b2c65 WHIRLPOOL 92cf2595e167a47f571d565a61e69dee779b8a7dc52400492eb52bf9107936787d570f48af517d935fedb8ef89cfafcdde0b8c0bae2968dd3e69a80b58e42f5d
-DIST aufs4-standalone-0_pre20160111.tar.xz 804572 SHA256 0ecba8c2f34443d316a3d8e49f4678005ec82cd5052afde4937020b6f5641853 SHA512 e42e0374b7325ae1d1c2d99c9bac726953431e91607352219d2861a0aae32fd016c7a2e1321f2410f26e2b61cbfadc748242f74e74d309e2024d899f2d48448b WHIRLPOOL e381244e327939a78ecc6ad4314090ebd1c790422db31bc9e70501d120df5ecfa9dd4235ff17b007a08e958218975226b61490fa1caacb6aa317a6aa705dc67b
-DIST aufs4-standalone-0_pre20160118.tar.xz 825208 SHA256 6c964c812470f9b85e3fc801e58a6dfb5b25ef6efbcb959b02000534a980ab74 SHA512 10b39a84aee7bec7e701576e73c8107381dd06ae200754cc7cc48a84cd806a7819659390b750459c50271886ed9055071acbdaaa5a0d3a72be53313180a3c85e WHIRLPOOL c6bf2a0fceaae478ef6da747df9e8abf0b2c6a4c76c0d9feb0a8670bbf6adec3c6422cfbe3c8997b0bfacb2da10e803c038138365d647c0da24fd9aeea8d5c42
-DIST aufs4-standalone-0_pre20160215.tar.xz 931276 SHA256 2303db1f8116762baf0aeadb8191c0bf9ed00380a5855b2297c92716a50fc2aa SHA512 e07dee042700edb6c4aafc995910181b59067e5a62d8bdcbb8992efdd1f5afcb0d38322e85a0efe57dfee465c0e74bb597928fb3bbf5db86c4d2007a9fd88c46 WHIRLPOOL ef611cbf47204b9691bd432a83898e5543754dcdf5597a18fb0327f3b269f3c7cfcfc2e0a46bc0ec0952eee114508d81decfa59c03a683a74292d123c24bea3d
+DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 SHA256 22d0f723ff52190670da0e3dc4a3f0b81ba0b3b6f287484cf81165c6cd4b2040 SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1 WHIRLPOOL a8b7a9c80c7715d0f75c9ee15e78bfbef2db11d4d9fea6ac1e8163f86b735c57b7e6a5612ac269fbcc2c483537a06c1e7704b9c3db2c7dff09b08d228ba607a1
diff --git a/sys-fs/aufs4/aufs4-0_pre20150420.ebuild b/sys-fs/aufs4/aufs4-0_pre20150420.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150420.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150504.ebuild b/sys-fs/aufs4/aufs4-0_pre20150504.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150504.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150511.ebuild b/sys-fs/aufs4/aufs4-0_pre20150511.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150511.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150518.ebuild b/sys-fs/aufs4/aufs4-0_pre20150518.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150518.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150525.ebuild b/sys-fs/aufs4/aufs4-0_pre20150525.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150525.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150608.ebuild b/sys-fs/aufs4/aufs4-0_pre20150608.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150608.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150622.ebuild b/sys-fs/aufs4/aufs4-0_pre20150622.ebuild
deleted file mode 100644
index 9d4371f80640..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150622.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=0
-# highest supported version
-KERN_MAX_VER=1
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150629.ebuild b/sys-fs/aufs4/aufs4-0_pre20150629.ebuild
deleted file mode 100644
index b1843ad3c533..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150629.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=1
-# highest supported version
-KERN_MAX_VER=2
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20150928.ebuild b/sys-fs/aufs4/aufs4-0_pre20150928.ebuild
deleted file mode 100644
index e9d57d6b5a63..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20150928.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=2
-# highest supported version
-KERN_MAX_VER=3
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151012.ebuild b/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
deleted file mode 100644
index e9d57d6b5a63..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=2
-# highest supported version
-KERN_MAX_VER=3
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151102.ebuild b/sys-fs/aufs4/aufs4-0_pre20151102.ebuild
deleted file mode 100644
index e9d57d6b5a63..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151102.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=2
-# highest supported version
-KERN_MAX_VER=3
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151109.ebuild b/sys-fs/aufs4/aufs4-0_pre20151109.ebuild
deleted file mode 100644
index e30e5f26aa7a..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151109.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151116.ebuild b/sys-fs/aufs4/aufs4-0_pre20151116.ebuild
deleted file mode 100644
index e30e5f26aa7a..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151116.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20151221.ebuild b/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
deleted file mode 100644
index e30e5f26aa7a..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
+++ /dev/null
@@ -1,164 +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 linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160118.ebuild b/sys-fs/aufs4/aufs4-0_pre20160118.ebuild
deleted file mode 100644
index 08283b50ae37..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160118.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160215.ebuild b/sys-fs/aufs4/aufs4-0_pre20160215.ebuild
deleted file mode 100644
index 08283b50ae37..000000000000
--- a/sys-fs/aufs4/aufs4-0_pre20160215.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=3
-# highest supported version
-KERN_MAX_VER=4
-# lowest supported version
-KERN_MIN_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
-
-DEPEND="
-	dev-util/patchutils
-	dev-vcs/git"
-RDEPEND="
-	sys-fs/aufs-util
-	!sys-fs/aufs
-	!sys-fs/aufs2
-	!sys-fs/aufs3"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK+=" !AUFS_FS"
-	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
-	use nfs && CONFIG_CHECK+=" EXPORTFS"
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
-	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	case ${KV_EXTRA} in
-			"")
-				elog "It seems you are using vanilla-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-			"-gentoo")
-				elog "It seems you are using gentoo-sources with aufs4"
-				elog "Please use sys-kernel/aufs-sources"
-				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
-			;;
-	esac
-
-	pushd "${T}" &> /dev/null
-	unpack ${A}
-	cd ${PN}-standalone || die
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	einfo "Using ${module_branch} as patch source"
-	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
-			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	popd &> /dev/null
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake \
-		CC=$(tc-getCC) \
-		LD=$(tc-getLD) \
-		LDFLAGS="$(raw-ldflags)" \
-		ARCH=$(tc-arch-kernel) \
-		CONFIG_AUFS_FS=m \
-		KDIR="${KV_OUT_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs4/aufs4-0_pre20160111.ebuild b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
similarity index 71%
rename from sys-fs/aufs4/aufs4-0_pre20160111.ebuild
rename to sys-fs/aufs4/aufs4-0_pre20160219.ebuild
index 08283b50ae37..391d3e9b7e3d 100644
--- a/sys-fs/aufs4/aufs4-0_pre20160111.ebuild
+++ b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
 
 AUFS_VERSION="${PV%%_p*}"
 # highest branch version
-PATCH_MAX_VER=3
+PATCH_MAX_VER=4
 # highest supported version
-KERN_MAX_VER=4
+KERN_MAX_VER=5
 # lowest supported version
 KERN_MIN_VER=0
 
@@ -42,19 +42,24 @@ pkg_setup() {
 	use nfs && CONFIG_CHECK+=" EXPORTFS"
 	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
 	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
-	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
 
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
 
 	get_version
-	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
 	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
 
 	linux-mod_pkg_setup
 
 	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
 		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".13+
 	else
 		PATCH_BRANCH="${KV_MINOR}"
 	fi
@@ -72,19 +77,30 @@ pkg_setup() {
 			;;
 	esac
 
-	pushd "${T}" &> /dev/null
+	pushd "${T}" &> /dev/null || die
 	unpack ${A}
+
 	cd ${PN}-standalone || die
+
 	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
 	einfo "Using ${module_branch} as patch source"
 	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
-	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
 		if use kernel-patch; then
 			cd ${KV_DIR}
 			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
 			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
 			ewarn "You need to compile your kernel with the applied patch"
 			ewarn "to be able to load and use the aufs kernel module"
@@ -95,13 +111,15 @@ pkg_setup() {
 			die "missing kernel patch, please apply it first"
 		fi
 	fi
+
 	popd &> /dev/null
 	export PKG_SETUP_HAS_BEEN_RAN=1
 }
 
 set_config() {
 	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
 		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
 	done
 }
@@ -125,11 +143,11 @@ src_prepare() {
 	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
 	use ramfs && set_config BR_RAMFS
 
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/pax-4.patch
-	fi
+	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
 
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
 }
 
 src_compile() {
@@ -147,18 +165,19 @@ src_compile() {
 src_install() {
 	linux-mod_src_install
 
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
+	use doc && dodoc -r Documentation
 
-	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
 
-	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
 
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 	linux-mod_pkg_postinst
 }
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index e51bda4b7793..be99af5d9f1d 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,50 +1,27 @@
-DIST aufs-sources-3.18.1+_p20160118.tar.xz 168952 SHA256 f6cb39f5be05bb497bf863cfbfe0a23f72503c2e1907f649865caeeafce32ca5 SHA512 1ce85cdcad82e4caad33d8e62e9b73106dd67c1555f195fa918346cbcc59670cec42bbee69cd8d2b2a183b58494eb8acca28918b1e8476fd5fc6bff2230ce168 WHIRLPOOL 1908bcf367a41b9dcb836b9de8bf017cb96a645713b418584f526ae0bbc94d9cdeab398d3f388d31b9f1ceac2c7fa82451b0820d1b10b72cdc4769c5eabc4497
-DIST aufs-sources-4.0_p20150518.tar.xz 166024 SHA256 da653585bfd610bbc874b9f51c76777511a9b15eb662917f653af1ef8d255936 SHA512 b7e7f681b8125c98f6ea28482243edeb16952ac0ba53ebb7992a0988d54066dd288bac732cce7b6f89485407fb69f6bce164f9bdd09f15b446acba1c28c2905b WHIRLPOOL ed3eeb9658d87714268b0f03bf1de80aedef697f51a80407211b68beed5af8efca77d14de0dbcc9873f30b71fc4b026c6270b6c75ac0fd7e22ec89432867d17a
-DIST aufs-sources-4.0_p20150629.tar.xz 166624 SHA256 af28e0752a1f9c0edf34519b58ed4aaea9e3538a3041110061d1fa55e25acfca SHA512 c68c077bf399d188c72f8c2c6ca4ce634fa710b84296275529f1a8a20c3c923ca7d418cd564d66651b5dbc3544bc556f763a5c3687e3fede55e36b13223a2bec WHIRLPOOL e3590e5da82ae5252c1e318dd775d950a14c3ac0f6235552cef0943f304361299ed33731e7365f6ef586e02e7d23be5dfdc613b40f48a042655b2a110638ca3e
-DIST aufs-sources-4.1_p20151012.tar.xz 166736 SHA256 05c5f7e565d58b98db443752c1f7b085be2ea6b3328a7ad43ad764c72c58c9be SHA512 95f43145dea8b2068319453450de434b44b1d07b947b1ca795e7ca44e8d2c5bfb619aeb1fc8eb2085351a4a078c30b5641716def5703c9e651613f4761404d78 WHIRLPOOL 05ea5374ff905113ffbda7b17964f82ea7f2a5df0126af887cb7524d68661c8e381d094c02e2592ae4ab7c97f553d866be988adf1c938fe1acf1eca253e03db4
-DIST aufs-sources-4.1_p20160118.tar.xz 168084 SHA256 6fb93b41c76ce80c09cc9e331da275f202ea4de91e3883009be976cbdff28219 SHA512 1bb4c2414ab180db27d37be470125a0828923b64830b3566968205369e9d75559ef150421f8f7ac3e48580f82978ce71c4adcb173ea820c7c531538ca151f0b8 WHIRLPOOL 75e357bbb83d7406557985a00157ce715e1b4d6b2b4df69585de87885552da7101b3b5163b08d15da53addd2348ad1a12dd5b4b00e01ddd68f9c09d61b3f4442
-DIST aufs-sources-4.3_p20160118.tar.xz 168440 SHA256 904f4f50d4f24ba563480f737a13696782d506e1d1a9ea915a09252b23b0d7c9 SHA512 5527b4614b3cd81ac23645117f52495f30484b43eeff80f1de3f382aa6daedae5c60c13a17e5e60eb00b9750c5f7731d95589aa8927603eab4b128fb3bcad149 WHIRLPOOL 7e7ed7e0738e535fe0a858aca31886d30225b40d9f6937e9e99efb4f45ad20624975ad6a5b5ee228e1c739b32d09a5c7391ab07ff99bee26e3723248b875c12e
-DIST aufs-sources-4.4_p20160118.tar.xz 168316 SHA256 9f28b43dc7ba8c70a61ecb1726debf087226e68c2381d10fce72161c7fd443bf SHA512 fbb0b4dc6fca6c3b8d8f43c610c2029bb117ed51f42dbd868fd8098c380480782517cae385618c46ec7a8f416298077b810285d57202a9fca157ca0dff846031 WHIRLPOOL 6f355b41e31e707f0674dcf957055e26a18769b7f576e48f79c40594c04a662655996a3911cc7128fd5fd07ab5f18ce0305b7e763a786b4cffb5f630bc0e5f80
+DIST aufs-sources-3.18.25+_p20160219.tar.xz 169620 SHA256 62e28c5f345182c324d4bab60eabe1e9a6ba98c3c6e9527e82162ea921fc66da SHA512 05cb10f1389feddd1f746542d544c9648bf6731a365ad807f540eb668334c10c86650786e43462a97950068d1bbb9cf3a91a2f38ea3ae99a56f10b633c836e28 WHIRLPOOL 12ff0727544a0e1fecd438b81add6fd8c391b98ea9e8a9679b64a82190257e41ede09cb63381bf27ea94d2bebeee23965180ef9e229c2728492c95bd3644dc67
+DIST aufs-sources-4.0_p20160219.tar.xz 168396 SHA256 16e4044f8bf83b0dbb8f6b087351de4d619f873b7023e22855f930bd2b55d10a SHA512 68cf371383250575afce395fbc368208db92b78168be31137ff9238017d40c141b29efbcbe68a850d54f8b4fa36d1556d243682a66417c67e28464b667ecd292 WHIRLPOOL 2b1008e8b76811537ed68a8b932cb488230736f3a89a815ee77cbd4d2a15a9ebaf98099fdc1aa9f084b8daad96d847e1b1decc195b5d2b0613a92512e7f9a3ef
+DIST aufs-sources-4.1.13+_p20160219.tar.xz 168840 SHA256 e4eac1836d9ad7860599b7c036168df8f2060bff834fd24dc168413c03c449bb SHA512 336da270576f83930bf338b063092e78949929ce53dcf0ad6f9d4072bba6978ff70a5b3dc1d1e358c904d49630fca9c3f82f34a9b44219ba62e30d4f8030b1e6 WHIRLPOOL 4a4530c4208ba5af675c41a0e6d61857a3cd67ca55e5f15b0a762aaec6246b480e52d43af39fa7ccb61bad651f0011cff445c0337d4e92213d7d2438e2a6fe40
+DIST aufs-sources-4.3_p20160219.tar.xz 169048 SHA256 6471c1ab669fd59f62f6d3b21ca6277c67f621ce6a362d87c2f603aa57824ad5 SHA512 b6640165c41db58ca4208cf1487d16b5fd0afc0358f3e759cd388fd952e3c7430d9e5457dd1712933e90f99d4d0baa9627d456d9d22c68db755a61bf12fa52f7 WHIRLPOOL d504577d772b5637986a0f645564b27efc0a914a265e3bde60ad0d6054e72b15ec50c6a48c9c32c1022b25614c1866509c04c6ed45852389084b063bf9abf139
+DIST aufs-sources-4.4_p20160219.tar.xz 168956 SHA256 f8d1b9bea2e69f73020aa43dde5b085444fbf346b68997db03a7a00140acfc2e SHA512 0da7257647838f3f7d2703ba8d8e2fb9f98a28dbdbaf4dd4f56727255759279f8774481fdb6ea7927a9b3b174056825416d7bf8e736625a98e024873f09a5933 WHIRLPOOL 5832a517fa0e231d4c1af9cb68192b7aca588a54efe34bde64260d172f0ed6c93335d577025174b9f3af50fab0ccb0973553bbab51abc29f410a3939f154deb7
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
-DIST genpatches-3.18-25.base.tar.xz 752676 SHA256 3ab39ed47165216251f369d816649995148936c1d70c2288a5a38a9601cc8197 SHA512 168d9bde976ed99d3ff5a6f83929c8c4b0b29b8216f1695a508c361c9d99ead9b3d6df81eb701bf8b70ea9a5ee6fc9784866f52353f1b4ca90cefab45d8d13eb WHIRLPOOL 9d31dd6261fecfde390306f2407dbe3e2f6f934f161ba66006297fde5191fce3073398b9a617b545a90756d414b4c1b1bea87ec6211f69a177dc1d544e374ab3
-DIST genpatches-3.18-25.experimental.tar.xz 61616 SHA256 467e1302e82f0a5afaa0f3687a0b5978524ef06d2c99ba36e76d6a8f130bea84 SHA512 a31df47bfb00f428d5419c17ae21e2bf58aded932b4f2ebe73b0f0aabdfb19f4599feaede611f31ee93a205519f7dd7f88b897c17ac4feff1a3228c887a58820 WHIRLPOOL 8dc0a5670864c84688272787fc284630980285003cef165629e0083ab1671b7dbb95c1278f1ebb7c80b37e69ec2806fe7067bc9ca4bbec6b30073de3965e13fc
-DIST genpatches-3.18-25.extras.tar.xz 16180 SHA256 276495f7316026a91cbb74abc7032bfa4531f209d6092226d1aab70ebb8973e0 SHA512 6c7a040b6f2ea7968f163fea171a51cfa4a0ee04a7a05a1592ed71b8d0e6554b4b2d8137ec2e41a2e703d5913fb2998a6e6f85087c3cb0d6855cebed6f341f8b WHIRLPOOL c0b43b808ece970290867356556fb2b3b9ce6b6621a3772e08eeaf07dd323d048c8d1efb4c2dbabdf77550fd912afdd74bcc9a33c3180dd97938cc2f0e6598c4
+DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0
+DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3
+DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
 DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
-DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953
-DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952
-DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b
-DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9
-DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0
-DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6
-DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73
-DIST genpatches-4.1-20.experimental.tar.xz 61652 SHA256 155bbcf04d07d2b02523c9e64323f000ea24fa2b06d1472ceaf125e70e2ece25 SHA512 5f03d99b5c35384a158a2568516a41b9bfba8c373f1b004e1493bb2071b4de321b66ddd623bf71cd6fd85f4c3af1d2d45316dd3b2424b113f292ff4104e976c3 WHIRLPOOL ff6668b2f2301e34ba3a387a1216d8ab65f720acc6b2a6218f2d883c2ac0c1fa608e1cd0b07033eb6e114e4ae9a88ad7e3ef6ce7a4f6da8b241149ae08a8ec23
-DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3dfc1362fdce415947382c77098082d34d7 SHA512 5ae28d62ece98e9f39b68e6ffbc205c3c7e47b9048a67e461f944f1b05e39de865973c11a4fa6dcf34dea65e2cf883f537be4aaf24c704ff311c0769c68a286a WHIRLPOOL 58c8389b43898e4700d81fd12496acbf954152e6879e0f2d0535686ebeded273032080569c18fd739a8e2c07c6b55f8fe58adc2ff21c436c33d20e2a8eed6fdf
-DIST genpatches-4.1-21.base.tar.xz 462148 SHA256 0ec07c9617ee2e5f9d1f4f071c5b5696274f2a0275508a7e527ee94565b81ac4 SHA512 59d306ed7275c20e41f2056b92b180c364be645af2d0a570e35b83dece8aa314a558503d1d9cec5c0113585ad6a72297d1396d16aa82ac7cb22fe83648b104c4 WHIRLPOOL f8f35d173c1ca70b9fc6e7acb39ddcec1fece29d7a6ee51e586147aef4c2d2f1846c98a35d0cf5024687fa5f2e87031b47f6b4819764fa7cef0916018b5ba411
-DIST genpatches-4.1-21.experimental.tar.xz 61644 SHA256 4237ac2effb4817c73a27a33f20cfa6704bbcc715a247754abf63dd980071f73 SHA512 8443ca5be9c2403d8d28a0ebeb3402f8d28b5f056564706addb9bb0e8255b8c095a2586b273186e1d6ca82b44fba73ffe5ed6590eb439603c5bed61809804a5c WHIRLPOOL a7b6c456e510569b3acfdeb675e51d902b39997d1d5923c66c6f446f634e45c219e7d7f90a66f0bad9267d1328a3a83a470cd7ee503884b201affea88340561b
-DIST genpatches-4.1-21.extras.tar.xz 16180 SHA256 f1e5767b655aa56d66b182001fbf5108294f8675bd022bbff5c470064b23c1d1 SHA512 8aacd4f8dd9fab6a106f4733872d37ce1784d309263eb4c55558bb80086ae944b85f47bc7d518f7a8798d620dd2b776ea9744f9c69d22b90a4298f5d930c4d7b WHIRLPOOL 12245af4d94106aabf55319a616cba3f089b7f11ead5cc9947e1a593ebace164bc29c813254e941f7ddfb0cc98ef6bd1844896d708f78efda06af4ba1e018610
-DIST genpatches-4.1-22.base.tar.xz 496068 SHA256 2e8bffcd6f12687fbf8af81182b68671b178aee11455330c173dbd60aabe01e7 SHA512 2949472a6ee6e03fe0c04a2ce34d8afae56f5c4b92397d73211852dee09aa70ffcc5cdcd1f730a6b19e1b6dbbba3cfe769edcc297a0afac145b2445e6d947681 WHIRLPOOL b46e4fc296556b9d70aca3af1bf02418cdcfab1f3afe1297fac2ae2282260cd76d3edda8f18c32baebda25caadca70f13e4876c284c04fdae7ce648de5ff5308
-DIST genpatches-4.1-22.experimental.tar.xz 61632 SHA256 dd10f3d0a034b8cc12fae479034384f4c19a06e3e990ed78b3c9a9df557a36ca SHA512 94a1ec19ee77c8a36918e0b4722d4c4df945dc23d36dcb26eb16476cad16ed07086277b623d347fac05afe8dba9531be8df183c328b2a9beced8679184054c53 WHIRLPOOL f99a2897a2cd9988bf6a25133427a32482d6ca044700517d268111bffa5e470e3a931e9734f132569c37b4dade8d25dbe15e5a62aa6360abd328bfb84dbadccf
-DIST genpatches-4.1-22.extras.tar.xz 16180 SHA256 c45029f048af2ef0a90db03f800f764559efa2eecb7c0e388424348d05adf906 SHA512 c75b4620aca4160946dc25ba7d8eb7657319a7528e126a90a5481f68a90e41284c6fcc695f611ef9f7ec0718b649242d4a69b0588730401273101b6744496e4a WHIRLPOOL 2432b7490691c813bc11410646cdbd95df791b19752997412edb087c5c8dc4bc9ef185804c3f750deeef8ee3c751909451927d15cce1b937ace0f3cc1a6c169e
-DIST genpatches-4.3-5.base.tar.xz 76536 SHA256 ef0d2bf2101d848ef6ef97ebb680dfb546aec91efdc17acb45bd234e4e7d2fe4 SHA512 635008532fc56f68e5867143367ecd7f3e277dda796d2c311e61459b6b1e454f0822664bfae02f59cce691246ba9a7d0f6ed6a5817230e512632c80b71ab6b7b WHIRLPOOL b467abff1276bb5884fcdeaed9d15ef7dd0a31f37e44b77c98214758bf406b21a5143b516a1c15056146af426122ec255736a33a643ad3bf10afd6d052070ccf
-DIST genpatches-4.3-5.experimental.tar.xz 61640 SHA256 487bb6919e05409308db7cbce48f0c059aa426e843cc92f92fee485b1b960d54 SHA512 a62b720a233628e593902fed82c7d60eee5b079e33bc313599f93228dfcee12159987cef8852a391aad2971252f728af914a8c7118ff8484393aab1193c2ffab WHIRLPOOL bcf996a05e20bd611382181b88b9ffa789b0d6665e48bb7e0f398e5f386598dd37ff39e33af0a4bcdb873cacf2b40a032e587adc5acd9117bf5f9e99ea18480c
-DIST genpatches-4.3-5.extras.tar.xz 16284 SHA256 79a6d10fba5a62519d4818cb16065476ae3ed6667012e77c84d4a5d61df2f26a SHA512 cfb85a6b475b1e53eec42b5fdde16372eaba7502f8ea783b3d7bffe369ea2bee6d4f65f5a7f32e8a485a0102090b7f0d9bd026c1c68fde1bca7190bd6647de61 WHIRLPOOL 90c1ff6e3a1d97d695f69e08d0a0fd8f7e48d215b74b3c98febc32b05333ab7bdc53c8f843f2371e1d0d7825d25eb12ebe5fd3f1c392415b5dfae45223458db6
-DIST genpatches-4.3-6.base.tar.xz 90396 SHA256 ca44364c8a8f4efa483926ad9c562f569c08fb713a1a3aaafa1e4adf10da6312 SHA512 1272acfc097f50af8af0906893a2054dfa86c5ea7a123ab63b0d43f9b403832bf043164b0c242ddb8ad61688d01d453442de4cf24cd5f1fb897763ace293ed1b WHIRLPOOL 310a5e84dff7e88613a563e6e791526f8e1766e81b084514153c8c69a615e6097e597f8ac967db929b79f0ddde5ff9dd843b54dded23cdf14642dccd26a3e949
-DIST genpatches-4.3-6.experimental.tar.xz 61624 SHA256 344f1cefc1e7738451d3433fbcce3974e5599c3e8a416473e4340806b8b8323f SHA512 44411406af51d593b6fdc30c883b85acbc38b3561849dc893fb0d25094a2d4db47e55eade394645724fa9529e79410219568b830f7160abab5ecca10313e3327 WHIRLPOOL 8105c64f9d6a2c2fa7529ef1ffae78b3ab48a2790a49d3436078155b33c719192ae11c7de76c46293ab5ad3214fcb3af10792eeef8f01645c5f4392a2862e7ed
-DIST genpatches-4.3-6.extras.tar.xz 16280 SHA256 fc90c37419df393f084a5fbbe2d681d80aa9620c13984fb6a68b578b79504ecf SHA512 a4e347ad2181d5f2e4031f2392c33e17fb3704215ae25420a5953f9a8f8f0e5168617537c3fa07ad684540b9a8d15c7d1cb5bed62dcd8c72e75d07595d053833 WHIRLPOOL d6d736e2a3f2b816ca232caf2f9baf5e5305c1343e78fafd75d1f985d158fcc4baa438ca09c5ad34aae8b38f159c1245ab68ae872ba1455c324b13e93a4a6d74
+DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36
+DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416
+DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5
 DIST genpatches-4.3-7.base.tar.xz 137724 SHA256 f45b2b6bd27dd6ba0ce82f4b143078cdb99f729d344773ef31f42fff339f295d SHA512 3a910f0c0a41b1658190b005ca6cbfd82ddea72a65f09e26b4173371f5ff1f65a1712cd35633d0692f74fd8ff0d0fdb4163113ccca8c1de197d1ee52356fbad5 WHIRLPOOL 67611446db6eb94c59842874762797cd2986399e7304eb3adcdfd9a72b104a10dbdde7a22de87381f416ebe07ab312b80dc1a8946077a003bf5646db65aaedd9
 DIST genpatches-4.3-7.experimental.tar.xz 61640 SHA256 963f0c524dfb50dd9c8d9b211d672eeaaaa3f8fd5a1ae623dd9c4f1ad32513e0 SHA512 757630a3b74653fc9cbe0009069a3ac81eb7b989d02411234a328cb6ae4363afe5e0dfc4bd8d84828d8450951ed50a6b476d2b130f49bc32fa4251d0599b51c0 WHIRLPOOL 43fdb49d7d8fdd42775cd13c976cfc621ef879f9adaad5db971ed7f28ffdd5d8b5bb35cd0c6be3e01cbf3744ccd70f70dcc4a9fc82583c62b6e63e5c9a0415dc
 DIST genpatches-4.3-7.extras.tar.xz 16284 SHA256 11fe6eb76d8cfbda95001b05ee1c78243c7394d0a4e12600b3fbdfb69574c9b8 SHA512 503936e84af45909eb4df1b6b4968ca48cb65ed7617340270b41cfc41ad209b22a20ae63dd720901b750d905fa7215912a8c8d271c9544fbf2b3c1ca70adece5 WHIRLPOOL eb7beae6d4bd324b7b4e0daeb292891a53ba9072f30eb2c038e8b74af14643d20a577142c0fce72a36324866868582c8574700c1e86ad06aaa8ce4a7ff5fcb9d
-DIST genpatches-4.4-2.base.tar.xz 4416 SHA256 fbcbba8098ffea5957652a91de15ac41eb197443e7403b7aeb32b38b8a0d8bc7 SHA512 65cf7fc10a76be780134680811ebdbb2ed2deede73203688e5b32bef764eb2dec6bfc3399eb245082204cf571b06742dec90f9ee7cea6b34692f694cf0bc7bc6 WHIRLPOOL 554b3287f7011c62e3efe4a8e06cf635bd3768f9228fdabe25fb01b6f1acc1a47a7c96587fffe79e8aadcfe181b934c59512918453cfb27f867d5dd2d3a022d6
-DIST genpatches-4.4-2.experimental.tar.xz 4904 SHA256 f1b7bf2d00c34b573d195e841efe5dfb29354d901d2b73066e57c19fd9c7b8fe SHA512 5c98ea98c4648dd2fecaf7cfc364da04d136f4b084d9c1b0b2527deb7cb52d226d5709ab0324e22d75e56d44e42cffc66add0a432639a817b59e97b275f9c232 WHIRLPOOL ab0e36bc830de699d59be6f08d6293283668a3742f216f8189dcb695ccb293c3a60ea468836321835d0bfe3336f6731647698d8252630d06f8fd96886099d2e3
-DIST genpatches-4.4-2.extras.tar.xz 16272 SHA256 707735f41624d33489b10c771db536f119bcc5f0d13cbcc38e91977b8b12ec41 SHA512 4f3d9463a9e6f618e6a3a66d4b9f1ca7ffbafa2d0c13308493dd5abbb23147abbc37c0e68a38b0c11c1f424fa1b2086aae88e820a824a1313ea9531507f7f91b WHIRLPOOL d9aeba2ce4e4db0697813bf116e27ec6e91f614316b8643539fefc28f5f522532fd746a56c91e706cf6f9e621019f050dd22f60f420d2aa15d2121383fdcfe1d
-DIST genpatches-4.4-3.base.tar.xz 26508 SHA256 76f5685698b02b81643d6b2edcd53217e0f6fa00e068a138f2eb3bc596dec2e5 SHA512 255e2ef79c56699e5b032fa392b2748570ce96c74f1172f4a4c1b4d22f8b8b0a9462c388028a0cad92e821815d39cfa6450f171d81fed5f274dce03979c39322 WHIRLPOOL 6da9edc7936f8857b929e589b2adcb17363a76ec5d85b3406fcb8308d6cb2da924f1f9af5062f85ddf4d415ca9d9524b731e8c4e0cde756e14ccc122a6e75c74
-DIST genpatches-4.4-3.experimental.tar.xz 4904 SHA256 e43014cc7aebea9e8d4f9e5c53e8e7a670f24693dbf6bc4b53dd17bb255f950a SHA512 60ae488e44c2e04e50cd456f3476548caad305b5807c0ce21251b7afdee4f4db300a68d14fb37984a1e4ea0be121c23cc8f145fa2964369fb83c0f2f32909feb WHIRLPOOL a5ff3f4e5adb1257a3c034e69fa639041051ea15080241fcd4c10201e8024575394f19e1bd36f046f3789a0d4ab4d26519cf142c52694b37105509423fef17c4
-DIST genpatches-4.4-3.extras.tar.xz 16284 SHA256 c0da41d2dca58113b257f2d21faa456867f2010a903dfd2b95639789c44c2c5b SHA512 150de4f7e7f81f12cdbb57a47802f9878ce0efad3553847a7f64e3428be45b22be432a51f6546daa156019f9480c3fab03b0871d255ca962a79037a10867f0e5 WHIRLPOOL 2a6ea3032726ab49ff78b7d01315a0099de9ba5addcbcb3fc88fd7ece137d6cd4e79a9737b05be60c4857ef6a37b71237e09d3cd19cb4a441e1d173fdc77a000
+DIST genpatches-4.4-4.base.tar.xz 63520 SHA256 1a682ab2279d2b57cf1575e10f70d4cd411bb209189ff9fcfd1270291f311fcf SHA512 040f590980aac0bba3805e959344f93ee9d32d4fc9e667e3cc2ab1b5375cef5043a4a0228c3fb34457af79579b96f5f587b9b0874ee066105acbe0250780c956 WHIRLPOOL 2f1bdacc234c18be10e0d3f61f3852d21cd6259d015146d7e274499f4fb9643e7e83151f3682d25c1f5a0adea507163dbcbb5e269f7f73b6e226b178a603201d
+DIST genpatches-4.4-4.experimental.tar.xz 4896 SHA256 e3c5381823db06220d1b464a8b8db3fb0efc0cae87cbe9695ccaefc956f9a17a SHA512 9ae08e11750d27a012c7b6019d14133decc14fb004d7152b83e71b0f400c3ed8bdfdf7d9f6538c8a0689efc5ff27760f79a34176275e79a99b6021a4c4db646d WHIRLPOOL 2cd692e0d14c04034f74c7742e7fea330e7a2741fc03220589d1e978e42998f4e23790e9719d38843d9dc0291f87b196ac026472a232793f10f594458c2866f4
+DIST genpatches-4.4-4.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.25-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.27.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-3.18.25-r1.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.18.27.ebuild
index 18469d2132b4..34a2023ed56b 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.25-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.27.ebuild
@@ -6,14 +6,14 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="25"
+K_GENPATCHES_VER="28"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
+inherit kernel-2 eutils readme.gentoo-r1
 detect_version
 detect_arch
 
-AUFS_VERSION=3.18.1+_p20160118
+AUFS_VERSION=3.18.25+_p20160219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
@@ -77,7 +77,7 @@ pkg_postinst() {
 	has_version sys-fs/aufs-util || \
 		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
 
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.4.ebuild
deleted file mode 100644
index 4e5fce4832e7..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.0.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="6"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.0_p20150518
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.0.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.9-r1.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-4.0.9.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.0.9-r1.ebuild
index e889bd4c5276..04761640edbf 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.0.9.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.0.9-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$
 
@@ -9,11 +9,11 @@ K_WANT_GENPATCHES="base extras experimental"
 K_GENPATCHES_VER="11"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
+inherit kernel-2 eutils readme.gentoo-r1
 detect_version
 detect_arch
 
-AUFS_VERSION=4.0_p20150629
+AUFS_VERSION=4.0_p20160219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
@@ -77,7 +77,7 @@ pkg_postinst() {
 	has_version sys-fs/aufs-util || \
 		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
 
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild
deleted file mode 100644
index 0e6da31766e3..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.12.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20151012
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.15-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.15-r1.ebuild
deleted file mode 100644
index cbd54e8f5023..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="20"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild
deleted file mode 100644
index 41cbb563496d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="22"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.1_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.18.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-4.3.4.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.1.18.ebuild
index 318a5fac8d44..ffac785eccce 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.3.4.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.1.18.ebuild
@@ -6,15 +6,15 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="6"
+K_GENPATCHES_VER="23"
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
+inherit kernel-2 eutils readme.gentoo-r1
 detect_version
 detect_arch
 
-AUFS_VERSION=4.3_p20160118
+AUFS_VERSION=4.1.13+_p20160219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
@@ -78,7 +78,7 @@ pkg_postinst() {
 	has_version sys-fs/aufs-util || \
 		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
 
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.3-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.3-r1.ebuild
deleted file mode 100644
index 35b8f0fc17c5..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.3_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.5-r1.ebuild
similarity index 95%
rename from sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.3.5-r1.ebuild
index 49b74483664a..0b05998a911e 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.3.5-r1.ebuild
@@ -10,11 +10,11 @@ K_GENPATCHES_VER="7"
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
+inherit kernel-2 eutils readme.gentoo-r1
 detect_version
 detect_arch
 
-AUFS_VERSION=4.3_p20160118
+AUFS_VERSION=4.3_p20160219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
@@ -78,7 +78,7 @@ pkg_postinst() {
 	has_version sys-fs/aufs-util || \
 		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
 
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.0-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.0-r1.ebuild
deleted file mode 100644
index d32433f7c74f..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="2"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.4_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild
deleted file mode 100644
index fa5c762f2205..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=4.4_p20160118
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.2.ebuild
similarity index 94%
rename from sys-kernel/aufs-sources/aufs-sources-4.1.16.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.4.2.ebuild
index 5db3662b4887..032e28ce9129 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.16.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.2.ebuild
@@ -6,15 +6,15 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="21"
+K_GENPATCHES_VER="4"
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
+inherit kernel-2 eutils readme.gentoo-r1
 detect_version
 detect_arch
 
-AUFS_VERSION=4.1_p20160118
+AUFS_VERSION=4.4_p20160219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
@@ -78,7 +78,7 @@ pkg_postinst() {
 	has_version sys-fs/aufs-util || \
 		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
 
-	readme.gentoo_pkg_postinst
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/www-apps/nanoc/nanoc-4.1.4-r1.ebuild b/www-apps/nanoc/nanoc-4.1.4-r1.ebuild
new file mode 100644
index 000000000000..d1af3969c5bd
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.1.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_TASK_TEST="test:all"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="http://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/cri-2.3:0"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	=dev-ruby/rdoc-4*
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	use doc || use test || (rm tasks/doc.rake || die)
+
+	if use test ; then
+		# Avoid dependency on coveralls.
+		sed -i -e '/coverall/I s:^:#:' tasks/test.rake || die
+	else
+		rm -f tasks/test.rake || die
+	fi
+
+	# Avoid non-optional tests for w3c_validators which we don't have
+	# packaged and which require network access.
+	rm test/extra/checking/checks/test_{css,html}.rb || die
+
+	# Skip a test that produces slightly different javascript.
+	sed -i -e '/test_filter_with_options/,/^  end/ s:^:#:' test/filters/test_uglify_js.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake test:all || die
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index e50b3537d6c5..2b0efb89bee9 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,3 +2,5 @@ DIST opera-developer_36.0.2120.0_amd64.deb 46346306 SHA256 2e572f3b8a3571c9f4c79
 DIST opera-developer_36.0.2120.0_i386.deb 46568196 SHA256 7d7561c4d46746203f456c560aa74cd385b500b44f8779712ad265797d9187ad SHA512 b09f5045f4b053734b1773d879bbef273545bb0662bbc01ffa609274f06363ba6037f374c6af0f5547680db986f3e318b63cde734a4f5b6a034c80a3e834953b WHIRLPOOL c1febbc4210328e514ecf945e1bbab988834ecdd68a79cc43f037e8f3b8f429e96bcb611aac3680de0286ba43d0717aa391d4cbcbc6706dca87ffa1c8e8103e6
 DIST opera-developer_36.0.2129.0_amd64.deb 46667976 SHA256 b549b232a0565fcc4f2a0f338f50f57545efbeaa8c40c8cfd64aff47955f8c46 SHA512 9f0b8a21fbd7ff8b8c0db65d5b2a98704ef458893cbf584411db26b6fda1fd8286d1fba287d7826105dcae582566c9e8a074e639c308dd5b3684c0c8c94542d6 WHIRLPOOL c0d8e8793bfe86ce82f2b76114c8d37b6edef3a2a6cae52f41af191e9eaf79901ba16d52c59bccc3a4a3069f05e2f6e218899c4d1713328ba82a59d50ee3fe0e
 DIST opera-developer_36.0.2129.0_i386.deb 48143050 SHA256 529d5bf6732c44fc5d23845f07d7b8e0a6922145f0389cb1858db8636cfead2e SHA512 7e3a7ee1d31f014f10a34d1ff728ad65bf52a66e5f201b38eac3a95dd499650b7e6fc911b0e507cec34562d7e6e0ea0e0298ca2bd5cfad256acb258e985c1776 WHIRLPOOL 8e3cfbfb2f2e9473ed864ca41f5cd05775b25f23d849b2ef94a6a2396b0a8efef3714d696e88e01b95d9f67ef81bf38827aa8146c850c67fd23e2ddb8ae1f78e
+DIST opera-developer_37.0.2142.0_amd64.deb 47534832 SHA256 bad16537194760f3be744163c2d88d5f228eae142865b704766de4b6c3d8f4f6 SHA512 6be695ad20b0d0bd0a2f567b4853c15d63523195136040e276ce07fd18a08cb369e63793c70fa735e332ae1d9c916f80502be18f3c1f4bc8fe343e1394b69281 WHIRLPOOL 9f797f0a3abae394d8ed1785d9a8c752521e5b63fecc73d580f6bb6837c3a15e951fb191480e2e1d2a74ee789de16299cbd9d8afeb7c3a80ebcfbee0923e6cab
+DIST opera-developer_37.0.2142.0_i386.deb 49027934 SHA256 db74f4b3159e5e8ed604b9d253f68dde1a430b303e520f8b3c11dc238dbc8737 SHA512 8174eddfa5d50151055fcbd39b2136bcdebfd0b043109b312d17470ffbd1d83bae6bf7cd857137ceaa0e415bd9330138c7e367d43da9f8a5f7caae9f45f1dba9 WHIRLPOOL 84f05191d55509f734a38adbf2b7850ec6b5c8f05ad5d15a1220d6d367a093de426d35f8f522562f5673274eae581164e811ca38b31a7e76a36d59ff2757b6e4
diff --git a/www-client/opera-developer/opera-developer-37.0.2142.0.ebuild b/www-client/opera-developer/opera-developer-37.0.2142.0.ebuild
new file mode 100644
index 000000000000..bfeded8ebfc9
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-37.0.2142.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6a5fa8bbfea5..d0990af0f0f4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,3 +4,4 @@ DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
 DIST opera-stable_34.0.2036.50_amd64.deb 44627688 SHA256 ca32b729d044cb85d657c6ac7e613a4e60f22c1b62ffbe2fb9aa3dde6c4ed041 SHA512 6183e07fb60aaedfa39929f2821f22b880497f61f625297198c205746c7308987a090d2a30452e38dffd8119620f41109c2d019cc0665d245b601cdb21942a5d WHIRLPOOL 967f4c287578c704e1ff4e2a5b743b869ed7618694d0d0ca2ba64800b259e9a30a374ebd72498ed85285b961fe9ccda7f26c62011129dd18a76542c66419beec
 DIST opera-stable_35.0.2066.37_amd64.deb 45350606 SHA256 3afa543f51d5f7fe4e8fbff93518c4afe0a0a8fab5e43210fbc0f6d42739d148 SHA512 6d4ff41316879bc4607b1a4c24ff537a215fdfae672724f3d3ae5e8928e6c03a51250aa56c29258c17080b197687a6f9f169deda16ea5d3777e821bc5f474416 WHIRLPOOL 78aa059e8efbfa6f0680287a34af3450dab5a707fe4c31308e198dfa92e7baedaaa478ee7d5bd080b385e379f52b431a8512c9c6456e3dc0d66ff0140cb3e624
+DIST opera-stable_35.0.2066.68_amd64.deb 45320262 SHA256 20805cc8832e1dfa961ae9f8917cb8099e62a5ea829224053927b24e2e2ceeb4 SHA512 673ccdbac2a8cbf98f5efbfb9e44be66ab886aedee1358e84f9c3b91dc23a5f724cb46b494585a85c672b74942b138697ce47786fed13018472b9a59eb2923e3 WHIRLPOOL 0af64f4313576db6d731d801702b63e54e37dd58dace8a351ede5062c787411a1124704e10101724d07999032fcd8c1548e8c37034b204ba9e590c9db69a940f
diff --git a/www-client/opera/opera-35.0.2066.68.ebuild b/www-client/opera/opera-35.0.2066.68.ebuild
new file mode 100644
index 000000000000..ec547a8df4ce
--- /dev/null
+++ b/www-client/opera/opera-35.0.2066.68.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru
+	sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
new file mode 100644
index 000000000000..875d4fa0758d
--- /dev/null
+++ b/www-servers/adsf/Manifest
@@ -0,0 +1 @@
+DIST adsf-1.2.0.tar.gz 162753 SHA256 ba564c1da4a60c848dcb47fb3e003cbad0d2c6cf393c189f334b35e59937b681 SHA512 e195d36fee5900cfad08521cb511e0941078d46edab5c621d0ea0808fc9045e95ed634d171e8049dd649313b0c2b9e86f00a9f026943593292da57125e6320cb WHIRLPOOL e0bab5114801a30a33618c8cf310ec4d7808123179a35e31b414ff63ad6cfb23f7986f50dd5cf46208e938fbab5cb65b664553f030e6da5fd149dfb6b51ac0f0
diff --git a/www-servers/adsf/adsf-1.2.0.ebuild b/www-servers/adsf/adsf-1.2.0.ebuild
new file mode 100644
index 000000000000..72344edeb5e1
--- /dev/null
+++ b/www-servers/adsf/adsf-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# 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_EXTRADOC="ChangeLog NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
+HOMEPAGE="http://nanoc.stoneship.org/"
+SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
diff --git a/www-servers/adsf/metadata.xml b/www-servers/adsf/metadata.xml
new file mode 100644
index 000000000000..f9772993b65d
--- /dev/null
+++ b/www-servers/adsf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>graaff@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest
index 0d39aec6dda5..149e784eb75d 100644
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@@ -1,3 +1,4 @@
 DIST smplayer-themes-14.12.0.tar.bz2 2660621 SHA256 2c520a678bfcfa8c9a6881d4612ce8fb5216abdf072d27fb3da362af316ae333 SHA512 b97c097c7bbbcc60878e9cf4306c08fb87b83da67763a965e9e21517fb02568e902cbc1c8739be3f54b7a5b398c49dc8ab81964b97140a64f34bcf8af9c39765 WHIRLPOOL bab1009ab6dfe693177a905a583454fd5614830c90c09f1a93832129342583efd8f6c4bce6c355e340e43062b06119fde1c5532136dd38cdadc72fe280603312
 DIST smplayer-themes-14.9.0.tar.bz2 2094596 SHA256 66164c0edc8698e174844ebbb7047a2444f249c569029cdc3c04833bbfb73238 SHA512 2c6b96c2fc5029ee3d4d6cd1204788c89c712d69ca230ba335f7a988fab181df9b700d8ceee446a7ccb852bdfdc82106fdcbf38ca199fb881088f9efc1ae1d7c WHIRLPOOL f68a511793a4f6fd270ce2708e4bfe5a25ef26493f18e9b18f49d5c19cb80fcab2a37c8494c9e9eac263a978ebce64e4bdfc4c0af32c6551a9f5dc7b4b2584d5
+DIST smplayer-themes-15.12.0.tar.bz2 3229694 SHA256 bd30b4cee576c4b1e4e8b59c986f93f2c2d150554d3eedb6e1dd37aa2e0fd110 SHA512 27fa91ed878c5b69d6d80ea90be15360a1224ff14e3828d71a9dccb8fbea10158377b1149c80e3260033a7d99a02586881ba2a57dc0e2b07cdacf26ae9c03ba5 WHIRLPOOL 2e13c3f1f244cdac3e58edfe3e9bb228927b3e7b28ed64360b1cd66fd36a6444be922054c4d2e9f208c83a0c79899a94e2a64d9ab3b2972fa2b82a7aea417e2f
 DIST smplayer-themes-15.6.0.tar.bz2 2903294 SHA256 3d64f4db3d5465230b995ef5140ca6716206b4479f15d7a4b52c5fd939b60138 SHA512 2381254851894386722e832c56b0b65d94465413c5ca49690d59f499e95a64cfb5067d705c1b27e0c27eefcab01863c945c3c619804a298a9e96fc3e23b2855e WHIRLPOOL a17a43bcede39441e47feedb66df417daa3db1c18b380dab9f941fbb15cfe2cc0754ce26eec0b469f15d6f49e5ab75372b55202fdefd4746f8429eb69cba983c
diff --git a/x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild
new file mode 100644
index 000000000000..19849b879b78
--- /dev/null
+++ b/x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Icon themes for smplayer"
+HOMEPAGE="http://smplayer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+
+LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4"
+RDEPEND="media-video/smplayer"
+
+src_prepare() {
+	default
+
+	# bug 544108
+	sed -i -e "s|	rcc|	\"$(qt4_get_bindir)\"/rcc|" themes/Makefile || die
+
+	# bug 544160
+	sed -i -e 's/make/$(MAKE)/' Makefile || die
+}
+
+src_install() {
+	rm themes/Makefile themes/H2O/Makefile || die
+	insinto /usr/share/smplayer
+	doins -r themes
+	dodoc Changelog README.txt
+}