diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3a6cc26a5d10..3af68ae007eb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f28771f329ea..09c556aec07a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 41b14eb60649..2a25d32ed0e2 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,3 +1,4 @@
 DIST consul-0.9.3.tar.gz 7278357 BLAKE2B 041164951fe798f51bc79ef4cf322e3c37b583471d66f0d78b0a100b57ee367a5942ef07fc85adafeb6c014b5a6047dae10da42427600de25656614c235dab1a SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f
 DIST consul-1.0.0.tar.gz 7354292 BLAKE2B f2e245cec5859e23dd55c991de5c4d68be8526ec7085273660271407d9f1898c803edbffaff3cd4f0d5de114b9d8b2cd205e03002d5685b77f831957b021140c SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88
 DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
+DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
diff --git a/app-admin/consul/consul-1.2.0.ebuild b/app-admin/consul/consul-1.2.0.ebuild
new file mode 100644
index 000000000000..1f9dd43d9356
--- /dev/null
+++ b/app-admin/consul/consul-1.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="2814197"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	newbin bin consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
index 5570060df99a..784b06891e1d 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/puppet-5.5.2.ebuild b/app-admin/puppet/puppet-5.5.2.ebuild
index 1bbef6e53489..646ad4fb5351 100644
--- a/app-admin/puppet/puppet-5.5.2.ebuild
+++ b/app-admin/puppet/puppet-5.5.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64	~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetserver/puppetserver-5.3.3.ebuild b/app-admin/puppetserver/puppetserver-5.3.3.ebuild
index 2b6f7873b99e..20133466d29d 100644
--- a/app-admin/puppetserver/puppetserver-5.3.3.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 9b02288d956e..95d95abd366d 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index f9ca44d49284..689c021d3f57 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,2 +1,2 @@
 DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
-DIST sysbench-1.0.14.tar.gz 1507008 BLAKE2B b2e5e53e65c4993b844f45cbf1dd648b8c67a4e00c6c7e713a032a15f5af7176d7fccf14120f1a485fe984e704386ec84d17391a9f7951584cc5072dcd153a45 SHA512 9030b1f40f6800d85ba4c7bf38041a509769983db4bce82b5cab097a5e4439e1ede5d8933f276779172537c961e6f670680bee106fcac3723ef99f361fdcc4f1
+DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
diff --git a/app-benchmarks/sysbench/sysbench-1.0.14.ebuild b/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
similarity index 100%
rename from app-benchmarks/sysbench/sysbench-1.0.14.ebuild
rename to app-benchmarks/sysbench/sysbench-1.0.15.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 38caef95c65a..8e50503ecc31 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 525cf0382fb1..f580cd62968f 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -2,3 +2,4 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
diff --git a/app-crypt/acme/acme-0.26.0.ebuild b/app-crypt/acme/acme-0.26.0.ebuild
new file mode 100644
index 000000000000..7c82dc6d67c0
--- /dev/null
+++ b/app-crypt/acme/acme-0.26.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 525cf0382fb1..f580cd62968f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -2,3 +2,4 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
diff --git a/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild
new file mode 100644
index 000000000000..ab98ef4612cf
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.26.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 2f2c9cd3e8a5..ab98ef4612cf 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -23,8 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-RDEPEND=">=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 525cf0382fb1..f580cd62968f 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -2,3 +2,4 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild
new file mode 100644
index 000000000000..bda8ab5ae6d7
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.26.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index dd9e6e8b4372..bda8ab5ae6d7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.21.1[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 525cf0382fb1..f580cd62968f 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -2,3 +2,4 @@ DIST certbot-0.23.0.tar.gz 1144448 BLAKE2B 820c4e3a0245a4ccda90884e38093d4f95ebf
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.0.tar.gz 1163858 BLAKE2B 9439b253a505f3cfb25f4ca33e6745b53ac51514dc34b31dd234c8db7dd07b9cb47b0a7edcc565dd7dee4678d0edd99590d2f235fedb77193e8ad1f0459c6b7a SHA512 af0f2498d79e9d54f0609b21b8ec40efe9fbcfa5162eb18bbb8b10cc230b31db6af81c4e85af243d92c527efc55634402b30960d014085f6e6af6e679ca75592
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
+DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
diff --git a/app-crypt/certbot/certbot-0.26.0.ebuild b/app-crypt/certbot/certbot-0.26.0.ebuild
new file mode 100644
index 000000000000..021424b910a3
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.26.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index f21b72555c81..021424b910a3 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>app-crypt/acme-0.21.1[${PYTHON_USEDEP}]
+	>app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
deleted file mode 100644
index 292fc264ac84..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 692208fd6c1547cc7dd2062a1d1c9499bc0a8be4 Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@g10code.com>
-Date: Mon, 8 May 2017 13:52:39 +0200
-Subject: [PATCH] gpg: Fix typo.
-
---
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- g10/packet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/g10/packet.h b/g10/packet.h
-index a10495c..d42510d 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -623,7 +623,7 @@ struct parse_packet_ctx_s
-   iobuf_t inp;       /* The input stream with the packets.  */
-   struct packet_struct last_pkt; /* The last parsed packet.  */
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
--  int skip_meta;     /* Skip right trust packets.  */
-+  int skip_meta;     /* Skip ring trust packets.  */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
--- 
-2.10.2
-
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
deleted file mode 100644
index 58568db47d2a..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 22739433e98be80e46fe7d01d52a9627c1aebaae Mon Sep 17 00:00:00 2001
-From: Justus Winter <justus@g10code.com>
-Date: Mon, 8 May 2017 14:24:00 +0200
-Subject: [PATCH] gpg: Properly account for ring trust packets.
-
-* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
-instead of counting ourself.
-* g10/packet.h (struct parse_packet_ctx_s): New field
-'n_parsed_packets'.
-(init_parse_packet): Initialize new field.
-* g10/parse-packet.c (parse): Count packets.
---
-
-The 'keyring' keystore depends on the number of packets for delete and
-update operations.  With the rework of the ring trust packets, the
-trust packets were no longer properly accounted for leading to keyring
-corruptions.
-
-The 'keybox' store was not affected.
-
-GnuPG-bug-id: 3123
-GnuPG-bug-id: 3135
-GnuPG-bug-id: 3144
-Fixes-commit: a8895c99a7d0750132477d80cd66caaf3a709113
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- g10/keyring.c      | 4 ++--
- g10/packet.h       | 2 ++
- g10/parse-packet.c | 3 +++
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/g10/keyring.c b/g10/keyring.c
-index e223f0f..50f1b82 100644
---- a/g10/keyring.c
-+++ b/g10/keyring.c
-@@ -409,11 +409,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
-     pkt = xmalloc (sizeof *pkt);
-     init_packet (pkt);
-     init_parse_packet (&parsectx, a);
--    hd->found.n_packets = 0;;
-+    hd->found.n_packets = 0;
-     lastnode = NULL;
-     save_mode = set_packet_list_mode(0);
-     while ((rc=parse_packet (&parsectx, pkt)) != -1) {
--        hd->found.n_packets++;
-+        hd->found.n_packets = parsectx.n_parsed_packets;
-         if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) {
- 	    free_packet (pkt, &parsectx);
- 	    init_packet (pkt);
-diff --git a/g10/packet.h b/g10/packet.h
-index d42510d..cf2121c 100644
---- a/g10/packet.h
-+++ b/g10/packet.h
-@@ -624,6 +624,7 @@ struct parse_packet_ctx_s
-   struct packet_struct last_pkt; /* The last parsed packet.  */
-   int free_last_pkt; /* Indicates that LAST_PKT must be freed.  */
-   int skip_meta;     /* Skip ring trust packets.  */
-+  unsigned int n_parsed_packets;	/* Number of parsed packets.  */
- };
- typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
- 
-@@ -633,6 +634,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
-     (a)->last_pkt.pkt.generic= NULL;\
-     (a)->free_last_pkt = 0;         \
-     (a)->skip_meta = 0;             \
-+    (a)->n_parsed_packets = 0;      \
-   } while (0)
- 
- #define deinit_parse_packet(a) do { \
-diff --git a/g10/parse-packet.c b/g10/parse-packet.c
-index fa44f83..dbb7af8 100644
---- a/g10/parse-packet.c
-+++ b/g10/parse-packet.c
-@@ -764,6 +764,9 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
-                 partial? (new_ctb ? " partial" : " indeterminate") :"",
-                 new_ctb? " new-ctb":"");
- 
-+  /* Count it.  */
-+  ctx->n_parsed_packets++;
-+
-   pkt->pkttype = pkttype;
-   rc = GPG_ERR_UNKNOWN_PACKET;	/* default error */
-   switch (pkttype)
--- 
-2.10.2
-
diff --git a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
deleted file mode 100644
index 53843900b9f3..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b7f48a0095a5b010b94f8192f4adc1adf8697567 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2018 16:57:19 +0100
-Subject: [PATCH] dirmngr: Handle failures related to missing IPv6 gracefully
-
-Handle the two possible connect failures related to missing IPv6 support
-gracefully by marking the host dead and retrying with another one.
-If IPv6 is disabled via procfs, connect() will return EADDRNOTAVAIL.
-If IPv6 is not compiled into the kernel, it will return EAFNOSUPPORT.
-This makes it possible to use dual-stack hkp servers on hosts not having
-IPv6 without random connection failures.
----
- dirmngr/ks-engine-hkp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 4a0b08f4f..a9bb93666 100644
---- a/dirmngr/ks-engine-hkp.c
-+++ b/dirmngr/ks-engine-hkp.c
-@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request,
-     case GPG_ERR_UNKNOWN_HOST:
-     case GPG_ERR_NETWORK:
-     case GPG_ERR_EIO:  /* Sometimes used by estream cookie functions.  */
-+    case GPG_ERR_EADDRNOTAVAIL:  /* e.g. when IPv6 is disabled */
-+    case GPG_ERR_EAFNOSUPPORT:  /* e.g. when IPv6 is not compiled in */
-       if (mark_host_dead (request) && *tries_left)
-         retry = 1;
-       break;
--- 
-2.16.1
-
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 82bd6c3f4955..789e3488cff2 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 39c3905c7b6a..30ef8cd533fb 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,4 @@ DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401e49459d1724376434265dddddd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586 SHA512 a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7edddd9
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
+DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild b/app-emulation/containerd/containerd-1.1.1.ebuild
new file mode 100644
index 000000000000..d3c39d6cfab5
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="d64c661f1d51c48782c9cec8fda7604785f93587"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
+	sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild
new file mode 100644
index 000000000000..face1dd8c686
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.3.0[${PYTHON_USEDEP}]
+	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/docker-compose-1.21.2.ebuild b/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
deleted file mode 100644
index 2e64dd53e966..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.2.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index d0b4977b3fd0..a41676055af1 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index 36b563ab3f8a..12e5845cfc26 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -1,3 +1,3 @@
 DIST alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
 DIST alertmanager-0.15.0.tar.gz 2755787 BLAKE2B 3c13f31c87605d7ff1e90ed8734c5415aa8ee3f9d5ba2713bd8ea8d6d56b013d70e60e3571714b4b423c82c139cb784eff146339a62e2e302c92e7e045d8b977 SHA512 df3b5146c333227ce463b7eed318c30e5c5192ed1728acd3e8664cab85be18b3c430d776063a4101611cdbb08be36f4a04cef9f9d8e053f4db443ea2dcab5853
-DIST alertmanager-0.15.0_rc3.tar.gz 2755833 BLAKE2B 60f17b61ad3ba518064b2999f2fab05d53fdf55c5b787314efbad0e427166442b76017951d3ca7bf2c886328d01713eeca7a36f975dad30d9fb19c0c176e1b5e SHA512 73370f18ba085e8b6701400d88983a849eb53734b14b187e56aacd89a57cf4e236332906add1f6ee8c3eaada0284b62d7a9b4174a888c694d48b8ecd120c186d
+DIST alertmanager-0.15.1.tar.gz 2756389 BLAKE2B 8da152f3edc856ea12025e08b108b47501d95a278e621198712831cc3b105085f4b6b0073c184314b2cc4b291c6d27d6fecf35d5c423476a92ed35f63fe66ede SHA512 b71c59fb1fb745e0d1aac39617cd208b778d215db9d4c72703f5d88a6f293451b63f941dab1c86a8a2257657aa1d9a243044711724e3bfcc66e64db36f473c6b
diff --git a/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild b/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild
deleted file mode 100644
index ce37eebba0db..000000000000
--- a/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="5e86f61"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/*
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
-	popd || die
-	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/alertmanager/alertmanager-0.15.1.ebuild b/app-metrics/alertmanager/alertmanager-0.15.1.ebuild
new file mode 100644
index 000000000000..0cdd5f83df8f
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.15.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="8397de1"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/*
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 0098660da2b9..79a3f861bf07 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST prometheus-2.2.1.tar.gz 5629500 BLAKE2B 7645267a2c5ed1c4138a5dd3929a48cb9dfa27789db38e98addbb06c37c6b482abfcf296ef1a5836bebd971d8224136c24a4ccd3093175882bb0beda1673deff SHA512 a94cf867de2b3be65b0a07307f89ebfa9c0a319820a72b3b6691edcd2e2b56b5268d27fb52bdaefea0e7084906d69b818e5292a39ccd5991e04e56d594f56ea7
-DIST prometheus-2.3.0.tar.gz 6171790 BLAKE2B bf08aaa124925a6fa1f610117919b5d4d15f4f4a71ff1bed1edca588b7cd4a14483a7ecbf3b3aaf5bfabe968290732b9fe3da522f726b673e0b910d2be3ead3e SHA512 2ab2bc2cc7c9bd9cafa16f54e24845b2e5c4b923bbc200ad9efae985b56587752892a364f08673e34278e6f8ad0b477482eec56632b281212af13a9110940aca
 DIST prometheus-2.3.1.tar.gz 6175030 BLAKE2B 395808ce10eee18469a34caa7a358325830717cce7199f4cd3e6da346326573e65695cd444ad1c37586f9744db51808ef78f4a50fac971fa0fbc7fd7a4089994 SHA512 f0930a8de3885f9d870d41b41b602cd19addaa362d0473c95723b6cff32fd28870f8d47c89b9d39e13f43e189ad991d7569baa1a6ecd1ca59ba85cbb3d3cd6b1
+DIST prometheus-2.3.2.tar.gz 6175804 BLAKE2B 98d7fe58043e5104b6eb181edd13a2aec3c347ae6d0325f08a267b02eef3bd8963603fb17c113244b47967a549ebe860f2a3f11e297ceca85b57495df7f19070 SHA512 35bd654f3326d36846654775e924821de9efc7b39c93d5ffc5e8f4db6feb456cf3b8833de3aa3df9d9f63481c487f2633b55b9610cef4e7a037f2a9b1ffbbd23
diff --git a/app-metrics/prometheus/prometheus-2.3.0.ebuild b/app-metrics/prometheus/prometheus-2.3.0.ebuild
deleted file mode 100644
index f437abf471ab..000000000000
--- a/app-metrics/prometheus/prometheus-2.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="290d717"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.3.2.ebuild b/app-metrics/prometheus/prometheus-2.3.2.ebuild
new file mode 100644
index 000000000000..1bb29b3310b7
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.3.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="71af5e2"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.10
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ca69dff1638b..ae96268ce732 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch b/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch
deleted file mode 100644
index 9a2d6c2e638e..000000000000
--- a/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://sourceforge.net/p/lirc/tickets/214/
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 53d0f21..f833b4b 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -33,7 +33,6 @@ nodist_man_MANS         += man/xmode2.1 man/irxevent.1
- manpage_html            += man-html/irxevent.html man-html/xmode2.html
- endif
- 
--docdir                  = @datadir@/doc/@PACKAGE@
- dist_doc_DATA           = irxevent.keys
- 
- if HAVE_DOXYGEN
-@@ -58,10 +57,10 @@ if HAVE_PYMOD_YAML
- nodist_website_html_DATA  += table.html
- endif
- 
--vardocsdir              = $(localstatedir)/lib/lirc/plugins
-+vardocsdir              = $(docdir)/plugins
- vardocs_DATA            = index.html html-source/lirc.css
- 
--varimagedir             = $(localstatedir)/lib/lirc/images
-+varimagedir             = $(docdir)/images
- varimage_DATA           = $(dist_image_DATA)
- 
- website_imagedir        = $(docdir)/lirc.org/images
diff --git a/app-misc/lirc/files/lircmd.conf b/app-misc/lirc/files/lircmd.conf
deleted file mode 100644
index 319362a321aa..000000000000
--- a/app-misc/lirc/files/lircmd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Options to pass to the lircmd process
-
-LIRCMD_OPTS="--uinput"
-
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 215534ea11c6..5961c678e511 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fa36b63ddf59..1a7ea0406ecf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
+DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
 DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
index f8ee3a7fc14e..2ad74e6847a4 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-02.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
 inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e18661caa86a..0db462ac9726 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
index a61de6f8eedd..adecfe2cc190 100644
--- a/app-shells/zsh/zsh-5.5.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bc4ff4644cb9..8e11e9a22e33 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 2fe034fa1608..80387cdb8ac9 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
new file mode 100644
index 000000000000..db78fa81d471
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
@@ -0,0 +1,12 @@
+Gentoo-bug: https://bugs.gentoo.org/657820
+
+--- a/configure.ac	2018-03-18 14:51:31.000000000 +0100
++++ b/configure.ac	2018-07-11 23:13:14.901127036 +0200
+@@ -119,7 +119,6 @@
+ saved_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${GLM_CFLAGS} ${CPPFLAGS}"
+ GLM_headers="glm/glm.hpp"
+-AS_IF([test "x$enable_tests" == "xyes"], [GLM_headers="$GLM_headers glm/gtx/io.hpp"], [])
+ AC_CHECK_HEADERS(
+     [$GLM_headers],
+     [],
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index 39b6f10a69f8..7e445ac2171a 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -4,7 +4,8 @@
 EAPI=6
 
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+[[ ${PV} == 9999 ]] && inherit git-r3
+inherit autotools
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -20,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	sys-libs/zlib
+	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
@@ -32,10 +33,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-glm-0.9.9.patch" )
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index 709bbbbb8ce5..bfa4a9fb2255 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 2c8dc8b713fe..2e26ed4c9204 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 1730df8afcbe..9a4e8fd5f193 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,2 +1,4 @@
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
+DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
+DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
new file mode 100644
index 000000000000..d03a01111223
--- /dev/null
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch
@@ -0,0 +1,87 @@
+--- a/gps/Makefile	2018-07-09 20:27:34.950424490 +0200
++++ b/gps/Makefile	2018-07-09 20:37:39.510558817 +0200
+@@ -47,7 +47,7 @@
+ 	for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
+ endif
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
+-	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
++	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7
+ 
+ resources:
+ ifeq ($(OS),Windows_NT)
+--- a/testsuite/Makefile	2018-07-09 21:45:48.115937491 +0200
++++ b/testsuite/Makefile	2018-07-09 21:46:15.896547268 +0200
+@@ -13,7 +13,7 @@
+ endif
+ 
+ all default: package
+-	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
++	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -largs -lpython2.7
+ 
+ package:
+ 	mkdir -p share/doc
+--- a/Makefile.in	2018-07-09 21:51:08.422550386 +0200
++++ b/Makefile.in	2018-07-09 21:51:32.187225891 +0200
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
+ GNATCOLL_INSTALL  = @GNATCOLL_INSTALL@
+-prefix          = @prefix@
++prefix          = $(DESTDIR)@prefix@
+ bindir          = $(prefix)/bin
+ sharedir        = $(prefix)/share
+ examplesdir     = $(prefix)/share/examples/gps
+--- a/docs/Makefile.in	2018-07-09 21:53:33.074572729 +0200
++++ b/docs/Makefile.in	2018-07-09 21:53:52.149311484 +0200
+@@ -1,4 +1,4 @@
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+ docdir = $(prefix)/share/doc/gps
+ sharedir = $(prefix)/share/gps
+ 
+--- a/share/support/core/toolchains.py	2018-07-11 12:15:18.758674244 +0200
++++ b/share/support/core/toolchains.py	2018-07-11 12:20:20.389220849 +0200
+@@ -16,11 +16,11 @@
+        nullified by using an empty value in the corresponding tag
+   -->
+   <toolchain_default>
+-    <gnat_driver>gnat</gnat_driver>
+-    <gnat_list>gnatls</gnat_list>
++    <gnat_driver>@GNAT@</gnat_driver>
++    <gnat_list>@GNATLS@</gnat_list>
+     <debugger>gdb</debugger>
+     <cpp_filt>c++filt</cpp_filt>
+-    <compiler lang="ada">gnatmake</compiler>
++    <compiler lang="ada">@GNATMAKE@</compiler>
+     <compiler lang="c">gcc</compiler>
+     <compiler lang="c++">g++</compiler>
+     <compiler lang="asm">gcc</compiler>
+--- a/share/support/core/projects.py	2018-07-11 13:49:29.631289680 +0200
++++ b/share/support/core/projects.py	2018-07-11 13:51:46.568252607 +0200
+@@ -146,7 +146,7 @@
+           <string />
+        </index>
+        <specialized_index value="Ada">
+-          <choice default="true" >gnatmake</choice>
++          <choice default="true" >@GNATMAKE@</choice>
+        </specialized_index>
+    </project_attribute>
+ 
+@@ -166,7 +166,7 @@
+        description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
+        hide_in="all"
+        label="Gnatls">
+-       <choice default="true" >gnatls</choice>
++       <choice default="true" >@GNATLS@</choice>
+        <string />
+    </project_attribute>
+ 
+@@ -178,7 +178,7 @@
+        description="The gnat driver used to run the various commands associated with the GNAT toolchain."
+        hide_in="all"
+        label="Gnat">
+-       <choice default="true" >gnat</choice>
++       <choice default="true" >@GNAT@</choice>
+        <string />
+    </project_attribute>
+ 
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
new file mode 100644
index 000000000000..e67c569534ff
--- /dev/null
+++ b/dev-ada/gps/gps-2018.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 autotools desktop
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="The GNAT Programming Studio"
+HOMEPAGE="http://libre.adacore.com/tools/gps/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
+	-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
+	    libadalang-tools-gpl-2018-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools]
+		(
+			dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref]
+			dev-ada/gnatcoll-bindings[python]
+		)
+	)
+	>=dev-ada/gtkada-2017
+	dev-ada/libadalang
+	dev-libs/gobject-introspection
+	dev-libs/libffi
+	sys-devel/clang:=
+	x11-themes/adwaita-icon-theme
+	x11-themes/hicolor-icon-theme
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	GCC_PV=7.3.1
+	default
+	sed -i \
+	-e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
+	-e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
+	-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
+	share/support/core/toolchains.py \
+	share/support/core/projects.py \
+	|| die
+	mv "${WORKDIR}"/libadalang-tools-src laltools
+}
+
+src_configure() {
+	econf \
+		GNATMAKE=/usr/bin/gnatmake-7.3.1 \
+		GNATDRV=/usr/bin/gnat-7.3.1 \
+		--with-clang=$(llvm-config --libdir)
+}
+
+src_compile() {
+	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \
+		Build=Production
+	gprbuild -v -p -Pcli/cli.gpr -XLIBRARY_TYPE=relocatable
+	emake -C testsuite
+}
+
+src_install() {
+	default
+	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 6a24d5d8a7a4..edd28515f2fe 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/mariadb-10.2.16.ebuild b/dev-db/mariadb/mariadb-10.2.16.ebuild
index d4065893621d..6e8b31cdccb1 100644
--- a/dev-db/mariadb/mariadb-10.2.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.16.ebuild
@@ -24,7 +24,7 @@ if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 fi
 
-HOMEPAGE="http://mariadb.org/"
+HOMEPAGE="https://mariadb.org/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0/${SUBSLOT:-0}"
@@ -904,7 +904,7 @@ pkg_config() {
 	local sqltmp="$(emktemp)"
 
 	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
+	# see https://bugs.mysql.com/bug.php?id=31312
 	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
 
 	# Figure out which options we need to disable to do the setup
@@ -933,7 +933,7 @@ pkg_config() {
 	pushd "${TMPDIR}" &>/dev/null || die
 
 	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
 	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
 
 	local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
diff --git a/dev-db/mariadb/mariadb-10.3.8.ebuild b/dev-db/mariadb/mariadb-10.3.8.ebuild
index b1c9bd25b6db..2f13d5760854 100644
--- a/dev-db/mariadb/mariadb-10.3.8.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.8.ebuild
@@ -24,7 +24,7 @@ if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 fi
 
-HOMEPAGE="http://mariadb.org/"
+HOMEPAGE="https://mariadb.org/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0/${SUBSLOT:-0}"
@@ -853,7 +853,7 @@ pkg_config() {
 	local sqltmp="$(emktemp)"
 
 	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
+	# see https://bugs.mysql.com/bug.php?id=31312
 	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
 
 	# Figure out which options we need to disable to do the setup
@@ -882,7 +882,7 @@ pkg_config() {
 	pushd "${TMPDIR}" &>/dev/null || die
 
 	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
 	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
 
 	local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
diff --git a/dev-db/mongodb/mongodb-3.6.2-r1.ebuild b/dev-db/mongodb/mongodb-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..5604f58eafb7
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.2-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.4-series. Then upgrade to 3.6 series."
+	elif [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -rv src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-3.6.2.ebuild b/dev-db/mongodb/mongodb-3.6.2.ebuild
deleted file mode 100644
index 5297f47b0f1a..000000000000
--- a/dev-db/mongodb/mongodb-3.6.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8:=
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.4-series. Then upgrade to 3.6 series."
-	elif [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -rv src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-3.6.3-r1.ebuild b/dev-db/mongodb/mongodb-3.6.3-r1.ebuild
new file mode 100644
index 000000000000..5604f58eafb7
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.3-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.4-series. Then upgrade to 3.6 series."
+	elif [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -rv src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-3.6.3.ebuild b/dev-db/mongodb/mongodb-3.6.3.ebuild
deleted file mode 100644
index 5297f47b0f1a..000000000000
--- a/dev-db/mongodb/mongodb-3.6.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8:=
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.4-series. Then upgrade to 3.6 series."
-	elif [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -rv src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-3.6.4-r1.ebuild b/dev-db/mongodb/mongodb-3.6.4-r1.ebuild
new file mode 100644
index 000000000000..5604f58eafb7
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.4-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.4-series. Then upgrade to 3.6 series."
+	elif [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -rv src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-3.6.4.ebuild b/dev-db/mongodb/mongodb-3.6.4.ebuild
deleted file mode 100644
index 5297f47b0f1a..000000000000
--- a/dev-db/mongodb/mongodb-3.6.4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8:=
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.4-series. Then upgrade to 3.6 series."
-	elif [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -rv src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-3.6.5-r1.ebuild b/dev-db/mongodb/mongodb-3.6.5-r1.ebuild
new file mode 100644
index 000000000000..5604f58eafb7
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.5-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.4-series. Then upgrade to 3.6 series."
+	elif [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -rv src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-3.6.5.ebuild b/dev-db/mongodb/mongodb-3.6.5.ebuild
deleted file mode 100644
index 5297f47b0f1a..000000000000
--- a/dev-db/mongodb/mongodb-3.6.5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8:=
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.4 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.4-series. Then upgrade to 3.6 series."
-	elif [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -rv src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.0.0-r1.ebuild b/dev-db/mongodb/mongodb-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..46989477c500
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.0-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.6 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.6-series. Then upgrade to 4.0 series."
+	elif [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.0.ebuild b/dev-db/mongodb/mongodb-4.0.0.ebuild
deleted file mode 100644
index 2b90de087414..000000000000
--- a/dev-db/mongodb/mongodb-4.0.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.6 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.6-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.6-series. Then upgrade to 4.0 series."
-	elif [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild
index cef323f12f47..4a54323f4338 100644
--- a/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 # sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
 # ^ is *-no-versioncheck.patch
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch 
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
 	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
 )
 
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 6af27445471d..fcfa85853fc0 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
index 09cb5078c2fd..d5d95ce11ac4 100644
--- a/dev-haskell/language-docker/Manifest
+++ b/dev-haskell/language-docker/Manifest
@@ -1,2 +1,2 @@
-DIST language-docker-2.0.1.tar.gz 31658 BLAKE2B d2f4ed51db1f6367ccb53aafc25e7473d4b7b1cf1b0d4f4e0692ca5db4b2f245ade1b80b37f9989c0a50be6b76996107c1b8e06024981e68ed1c9d96fb2f209d SHA512 f716f99dc23bf9e0de68e658330ee90befb3724a53ae97604c9a8369535db679dd9a5851c2961996619f4a3cf3ea462df487063a3e08afff7cd0c47538fc624a
 DIST language-docker-6.0.1.tar.gz 33814 BLAKE2B eea7d16895774435ed4b6dee3df48acaf032a289b70d9ac00efa057cb3d947c6de64df5b8e60cb4ae4f876e26091d40df78469dcbb2e3e9d54969aa7280c3ef7 SHA512 a50675309b177d2e2ba305046ba60cb0f9a071cc27c1483d9d244ab89c747be5a7ba022579cca94689e623210e2f518df0e59c05ffca3a386a18e981f4971cf8
+DIST language-docker-6.0.3.tar.gz 34438 BLAKE2B 1d324b1519583c4feec1d9dd132c977e3fed1d6dd2d8fef7e4a9dc15dc1a294294eaa0831cb97bbb2d22d0bf178195ba0e834e262d1ed3fcd4d9b118a3b474db SHA512 912f24db37cc2f2feac74fe89205e4538d4bae6426cf626cd090a7d38e451331db43f69e87c58b9f168145a4b0f5d90b203fac2c5165c834729099d6b47bc242
diff --git a/dev-haskell/language-docker/language-docker-2.0.1.ebuild b/dev-haskell/language-docker/language-docker-2.0.1.ebuild
deleted file mode 100644
index 24fdd9a0d180..000000000000
--- a/dev-haskell/language-docker/language-docker-2.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
-HOMEPAGE="https://github.com/hadolint/language-docker#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/free:=[profile?]
-	dev-haskell/glob:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	dev-haskell/th-lift-instances:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/language-docker/language-docker-6.0.3.ebuild b/dev-haskell/language-docker/language-docker-6.0.3.ebuild
new file mode 100644
index 000000000000..2692f0261474
--- /dev/null
+++ b/dev-haskell/language-docker/language-docker-6.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
+HOMEPAGE="https://github.com/hadolint/language-docker#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/free:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/prettyprinter:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/glob
+		dev-haskell/hspec
+		>=dev-haskell/hunit-1.2
+		dev-haskell/quickcheck )
+"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index baca38c2406f..006c71603c43 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/go-1.10.3.ebuild b/dev-lang/go/go-1.10.3.ebuild
index 8c2ff8874012..085d8581d6b1 100644
--- a/dev-lang/go/go-1.10.3.ebuild
+++ b/dev-lang/go/go-1.10.3.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/go/go-1.9.7.ebuild b/dev-lang/go/go-1.9.7.ebuild
index 503bf3c4a123..a5edf13b59d7 100644
--- a/dev-lang/go/go-1.9.7.ebuild
+++ b/dev-lang/go/go-1.9.7.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/php/php-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
index 56d281890cd8..152ebfe276c1 100644
--- a/dev-lang/php/php-5.6.35-r1.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.ebuild
@@ -147,11 +147,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	vpx? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
index 5b743906a993..fe5b563b7ea5 100644
--- a/dev-lang/php/php-5.6.36.ebuild
+++ b/dev-lang/php/php-5.6.36.ebuild
@@ -147,11 +147,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	vpx? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index a57432146374..08da09b6482b 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -141,11 +141,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
index cfcbd02ee740..9e0175a2b439 100644
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -141,11 +141,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index 0adf8fe59a01..da637b55abbd 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -123,11 +123,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
index f53642ef9653..b7d2c829465a 100644
--- a/dev-lang/php/php-7.1.18.ebuild
+++ b/dev-lang/php/php-7.1.18.ebuild
@@ -123,11 +123,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.1.19.ebuild b/dev-lang/php/php-7.1.19.ebuild
index 1432a2ae457c..d649e1715b3a 100644
--- a/dev-lang/php/php-7.1.19.ebuild
+++ b/dev-lang/php/php-7.1.19.ebuild
@@ -123,11 +123,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.2.7.ebuild b/dev-lang/php/php-7.2.7.ebuild
index ecf193ae0d19..4bc61dfc550f 100644
--- a/dev-lang/php/php-7.2.7.ebuild
+++ b/dev-lang/php/php-7.2.7.ebuild
@@ -127,11 +127,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.3.0_alpha1.ebuild b/dev-lang/php/php-7.3.0_alpha1.ebuild
index 27d2d493ca14..ba87c83f797e 100644
--- a/dev-lang/php/php-7.3.0_alpha1.ebuild
+++ b/dev-lang/php/php-7.3.0_alpha1.ebuild
@@ -130,11 +130,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/php/php-7.3.0_alpha3.ebuild b/dev-lang/php/php-7.3.0_alpha3.ebuild
index 532071c64877..ecc2efff30e7 100644
--- a/dev-lang/php/php-7.3.0_alpha3.ebuild
+++ b/dev-lang/php/php-7.3.0_alpha3.ebuild
@@ -130,11 +130,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml
index 7f14692ab9aa..3407a1ae8de4 100644
--- a/dev-lang/rust-bin/metadata.xml
+++ b/dev-lang/rust-bin/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="cargo">Install cargo component</flag>
+    <flag name="rustfmt">Install rustfmt component</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/rust-bin/rust-bin-1.27.1-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.27.1-r1.ebuild
new file mode 100644
index 000000000000..53d2d4e87ebe
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.27.1-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 versionator toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
+	arm? (
+		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
+		https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
+		https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
+		)
+	x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~x86"
+IUSE="cargo doc rustfmt"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	!dev-lang/rust:0
+	cargo? ( !dev-util/cargo )
+	rustfmt? ( !dev-util/rustfmt )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+QA_PREBUILT="
+	opt/${P}/bin/*-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend () {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	default
+
+	local postfix
+	use amd64 && postfix=x86_64-unknown-linux-gnu
+
+	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+		postfix=arm-unknown-linux-gnueabi
+	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
+		postfix=arm-unknown-linux-gnueabihf
+	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
+		postfix=armv7-unknown-linux-gnueabihf
+	fi
+
+	use x86 && postfix=i686-unknown-linux-gnu
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,${std}"
+	use doc && components="${components},rust-docs"
+	use cargo && components="${components},cargo"
+	use rustfmt && components="${components},rustfmt-preview"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${D}/opt/${P}" \
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+
+	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+
+	dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+
+	if use cargo; then
+		local cargo=cargo-${PV}
+		mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
+		dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+	fi
+	if use rustfmt; then
+		local rustfmt=rustfmt-${PV}
+		local cargo_fmt=cargo-fmt-${PV}
+		mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
+		mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
+		dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+		dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+	fi
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 01a3f45e06be..4f60e535553c 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -9,4 +9,4 @@ DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320
 DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
 DIST rustc-1.26.2-src.tar.xz 54613640 BLAKE2B f361b7a0ed40ccb026750b4a70b99931f1abf52024e907b588e339902de2fbbd15501d237ac048d0537005834b0a2f49935f654a8c75d40ed95c65894f611481 SHA512 a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
-DIST rustc-1.27.0-src.tar.xz 55455772 BLAKE2B 5c1b26a3e8c6e45aaa43b3ccb5819089cf03c32807ac1adc46ec4f9ff8cf803ec444587ccb737b5d701c4ef5fa634fc4c89de3d71e6202b64ec125f986e54ffd SHA512 b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
+DIST rustc-1.27.1-src.tar.xz 55458892 BLAKE2B 9c5cec24760afdcee51fb0ba8d2289b92d34de57e97e57f2e5dc129674edab4a595ab5756c789b5de15bdd5107363f12a517169cedc7c3093fa0241d200ca3ab SHA512 4a8c03476ca1867a1130b825724ecb6bd629b889d704fdd6c3de4e188f73e2d1acdfae413f26e37505d76109d23d8e9ab409b31af3d67d244f8552730ada292d
diff --git a/dev-lang/rust/rust-1.27.0.ebuild b/dev-lang/rust/rust-1.27.1.ebuild
similarity index 100%
rename from dev-lang/rust/rust-1.27.0.ebuild
rename to dev-lang/rust/rust-1.27.1.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 25df523ff9fd..5db779826444 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch b/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch
deleted file mode 100644
index da7f2f9cb3a6..000000000000
--- a/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct.orig	2014-03-31 12:40:22.186757814 -0700
-+++ SConstruct	2014-03-31 12:46:21.726024868 -0700
-@@ -18,7 +18,8 @@
- # for shared lib, requires scons 2.3.0
- env['SHLIBVERSION'] = '1.0.0'
- 
--CCFLAGS = []
-+CCFLAGS = [os.environ['CXXFLAGS']]
-+
- if int(debug):
-   CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-g -Wall -Werror'))
- if int(optimize):
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
new file mode 100644
index 000000000000..d551ca6aecf2
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
new file mode 100644
index 000000000000..d551ca6aecf2
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
new file mode 100644
index 000000000000..594762ecbbf1
--- /dev/null
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Pthread functions stubs for platforms missing them"
+HOMEPAGE="https://www.x.org/wiki/"
+SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+multilib_src_compile() { true; }
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild
deleted file mode 100644
index 47a6c4bc3558..000000000000
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Execute code after a scope finished compilation"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Module-Implementation-0.50.0
-	>=dev-perl/Sub-Exporter-Progressive-0.1.6
-	>=dev-perl/Variable-Magic-0.480.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Text-ParseWords
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		virtual/perl-File-Spec
-		virtual/perl-Module-Metadata
-		>=virtual/perl-Test-Simple-0.890.0
-	)
-"
diff --git a/dev-perl/B-Hooks-EndOfScope/Manifest b/dev-perl/B-Hooks-EndOfScope/Manifest
index de396dd2d237..f3ea1296649b 100644
--- a/dev-perl/B-Hooks-EndOfScope/Manifest
+++ b/dev-perl/B-Hooks-EndOfScope/Manifest
@@ -1,2 +1 @@
-DIST B-Hooks-EndOfScope-0.21.tar.gz 33336 BLAKE2B edd3c9428dbe689e1528b76a0383ec6c85ccd35059abbfdc0a6de613ca5648010e89a9f7fa34c627130ac81a6c247da6fcc7552dd6bd12ce676fed73de26ba8d SHA512 6c34b5e6bd9b355703339b5ec7625e8ecc94a4d38bbc1a94fb561c8832234a80a1d5f0b389e4479fe75a85afb15d9e56092c2c1ceca0c995b39fc5ba0e4a563b
 DIST B-Hooks-EndOfScope-0.24.tar.gz 37859 BLAKE2B b5e4f0061949af112b9bcb89c1352e1385222c291624df330e8e60d3faf48f78a669650b074b1659f8287f14d46bdb488da0c943a0d22adb5a50dc37aebf7754 SHA512 5c061a81a3fed88ad868a14a1f817f7952b2f0c9512408174354e0ecf7e3caa5d646054cf75efa8b8c558e6241a8dfebf9400e8826021bdb5cbdf3a00065b147
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-1.210.0-r1.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-1.210.0-r1.ebuild
deleted file mode 100644
index fc5c07947cde..000000000000
--- a/dev-perl/Calendar-Simple/Calendar-Simple-1.210.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DAVECROSS
-MODULE_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="Perl extension to create simple calendars"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86 ~ppc-aix"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/pod_coverage.t t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index 11d2b7329fb2..397aece70e3a 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,2 +1 @@
-DIST Calendar-Simple-1.21.tar.gz 7007 BLAKE2B e6e4f0528245dcff92b8c378418e47c719a954929f7b547a128099f13a1551be52c27e4ed5e3e9cec98b9599f87998c06965ee1c59a478d3f5e263a9745e439a SHA512 29ec836e774c5d3879c309eb58fdedddb12b146b382ed3c3cf014b602dd31edc7f4eff8929bd485968fa328931a589b4bde5cd87c3456b5665480ed51466252b
 DIST Calendar-Simple-1.23.tar.gz 7989 BLAKE2B 24c25e60021e6210e06645a51fd068c7e0887b5273c83b3fc2cf632deef2530e548d6c3282807c8564d4999ce2f133303a9bb2e6a40ae0aaa77cfb11f205bb5e SHA512 3d024e3de896a20b837adfc4fbac2bcd1dce969ac426445573ae0975e189ffde906e7c25d3c6f0595a7e49d47a09cd3e9bdfb6810ca7c9e20f9e01a4ecb7ec49
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a7c5ca25dcc0..81e06e2368ab 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0.ebuild b/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0.ebuild
deleted file mode 100644
index 15627e0244d1..000000000000
--- a/dev-perl/Net-LDAP-Server/Net-LDAP-Server-0.430.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR=AAR
-MODULE_VERSION=0.43
-inherit perl-module
-
-DESCRIPTION="LDAP server side protocol handling"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PERL_RM_FILES=(
-	t/02-pod.t
-	t/03-podcoverage.t
-)
-
-# Net::LDAP -> perl-ldap
-RDEPEND="dev-perl/perl-ldap
-	dev-perl/Convert-ASN1"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker"
-
-SRC_TEST="do"
diff --git a/dev-perl/UUID/Manifest b/dev-perl/UUID/Manifest
index 7b37a97d0ffb..92011a493cb1 100644
--- a/dev-perl/UUID/Manifest
+++ b/dev-perl/UUID/Manifest
@@ -1,3 +1,2 @@
-DIST UUID-0.25.tar.gz 14383 BLAKE2B bfdbe9d9bb2fdfcbd2b06f4985e00a2bdfed1a1d019aa9bdfc16fadc646bc0dfba18d31f00818f8e38f6f6b674a92e45f056ade319e3032eff3179c088e6a1b1 SHA512 b775692fd85597fb9786a376a2f290938714e61416eb213f7329d3fbf820a94912c9de5a1900fcba85e8cde2002c626bbfbca6a91dfd9ef0011b1e2d61bad65a
 DIST UUID-0.26.tar.gz 14535 BLAKE2B a1159c96d2c88bdfdf66f80924b121d646449742774427431cb323ac6dd4365b5c6166d1fbfbddaa7670b4e87927569fcb9e27b7289e6301d9f4b959ea5e9a72 SHA512 7ec7345fedd42e38ad50531535364565cdab2b091439992833a32804c543dd846f430688eee3b72b10ecb060127463cbb5f771c7ae11719398c22cce7b49274c
 DIST UUID-0.27.tar.gz 14690 BLAKE2B b4f296f82172202eb3af67f8e1e18dbbf4c36e3d6931f63aeaea32003fe1c3d5ad4c6d25540c4e1475f16841654b44d39164bff5dbfd35712bfec69dc7bdc039 SHA512 a7b45e0bf5461318cf8e6d874630afb31c98d5a10a5aa3408a27e48bcde051517d6c8bc904a2f05d2bd5aee076f06b07ddd535371e891eb7ac2e5845c4d930c2
diff --git a/dev-perl/UUID/UUID-0.250.0.ebuild b/dev-perl/UUID/UUID-0.250.0.ebuild
deleted file mode 100644
index 96c8efc75c24..000000000000
--- a/dev-perl/UUID/UUID-0.250.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=JRM
-DIST_VERSION=0.25
-inherit perl-module
-
-DESCRIPTION="Perl extension for using UUID interfaces as defined in e2fsprogs"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Note: UUID appears to link against a bunch of different UUID
-# implementations depending on availability and platform.
-#
-# Presently uses uuid.h/libuuid.so from util-linux which is fine for Linux
-# platforms, but may need special attention on *bsd, *osx and win*
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/Devel-CheckLib-1.20.0
-"
diff --git a/dev-perl/XML-LibXSLT/Manifest b/dev-perl/XML-LibXSLT/Manifest
index 2523ea74bbc3..7a78ebcee697 100644
--- a/dev-perl/XML-LibXSLT/Manifest
+++ b/dev-perl/XML-LibXSLT/Manifest
@@ -1,3 +1,2 @@
 DIST XML-LibXSLT-1.94.tar.gz 114015 BLAKE2B e16cebbfc5e126dc56482845af4f21b70c62ef08eb14bc79f678fca35d418858b33d69adc411836f4d81cdb7dde8fb535b9f4855a947deab60ec1d77a4edd9d5 SHA512 52b3ec6ef0556d9dde8320acbea01fe36e219bc62ed2d9e0cbe2f8f402bfc3f42ca1e28a6e047e69f501982fe4ba40d23fcfbce9399388c9f28a0d8804fc5f73
-DIST XML-LibXSLT-1.95.tar.gz 114231 BLAKE2B 792ceab8dd2e185c8c3c9a4a6981817ccb667006de588b9a8047eca8c27c63ed73e2aa5629314b723585fa2ca37f468bbacd2ff1d7596e9ca446aca56b412197 SHA512 06a1c9896a391be2588995f25520da05f086b3fa79109884131525a0d76a7b375e0c5a2febf8a79a888f3a9bd25b5eb39064de1baeffafcfe18f5576c9c54e19
 DIST XML-LibXSLT-1.96.tar.gz 114068 BLAKE2B 2225e387e9e877578be51a9a6c8c3612490e79c2cec366dd2fdc64710ce67200f5ab7109742197abcdc311f9a1bf16b42a40c7e7df4d669b638de4ee49782866 SHA512 7b6e22889c538bbd861c6420cd56893d229676d3afc1cf30e17cae48a4714139769a99a48a99f1dff52864f4989e410303007c07941625bf6bd12a24276c35e6
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
deleted file mode 100644
index 8f84f77ade28..000000000000
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.950.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SHLOMIF
-DIST_VERSION=1.95
-inherit perl-module
-
-DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Encode
-	>=dev-perl/XML-LibXML-1.700.0
-	>=dev-libs/libxslt-1.1.32
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/pkgconfig
-"
-
-PERL_RM_FILES=( t/06entities.t )
-# test fails, reason unknown
diff --git a/dev-perl/YAML-Tiny/Manifest b/dev-perl/YAML-Tiny/Manifest
index 3ba4513ac4af..bd29a9bae528 100644
--- a/dev-perl/YAML-Tiny/Manifest
+++ b/dev-perl/YAML-Tiny/Manifest
@@ -1,3 +1,2 @@
 DIST YAML-Tiny-1.69.tar.gz 71513 BLAKE2B e765df404b786a3cc22927ca47b1706ceb5e6d2518aaf313342987839c4ab5158b7d4bf4d553f91803b9ed5072efbd580ffffe2e92fd1c6ae0958b851530da0f SHA512 64c3428691f78d94bedf7f3b3276f7868d7280ca6d3c9a7a2e8137568d0da2fc94c766f9873f2796898386d6e7d3d1010c790fcc119f3d4d743becfa39d56a2c
-DIST YAML-Tiny-1.70.tar.gz 72663 BLAKE2B 38fd70deed477341436693a2da78d3e89e9b9dbc72c2872904e6a806b01987a09d875b416d75b2c68fea006e6823f19351dc630ac64968d0a1924c1a7824b405 SHA512 a4d790f8d797170fac819640d23a3ddc62b506ac9467d8922ed2ca8f1abacf5a6ba7604e5312f6539a3c9e4aa8c41ccd91754ca32f74bf8b0d89a9d84e4b4f53
 DIST YAML-Tiny-1.73.tar.gz 73708 BLAKE2B 42e9c5cffa2b9babb0dd1453af69866405fd7273c2b340ceb010d78d8fe28db61268b6bb5ad1840b1aa72819ae048150bf5c416bed1b2e518b28f77b2ba978be SHA512 5999e220025aa8076e5e0e9e73e80c2da21660e77f6744d73e8e29962221d02d33a36e9829c44abf7d4f45abae069d8e121c8019bd1600b7e64db5e54efd9987
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.700.0.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.700.0.ebuild
deleted file mode 100644
index e838a72c918a..000000000000
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.700.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=1.70
-inherit perl-module
-
-DESCRIPTION="Read/Write YAML files with as little code as possible"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test minimal"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-			>=dev-perl/JSON-MaybeXS-1.1.0
-		)
-		>=virtual/perl-File-Spec-0.80.0
-		>=virtual/perl-File-Temp-0.190.0
-		virtual/perl-Getopt-Long
-		virtual/perl-IO
-		virtual/perl-JSON-PP
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/YAML/Manifest b/dev-perl/YAML/Manifest
index bb242aa3c155..3058fc30316d 100644
--- a/dev-perl/YAML/Manifest
+++ b/dev-perl/YAML/Manifest
@@ -1,4 +1,2 @@
 DIST YAML-1.15.tar.gz 80702 BLAKE2B adb4874943a2bd1b7aab688d5a0843e78e28e2934138589ee2b3c502ea105c672c8d4e860607f562c231065f903abd0d20f79bc046316283b0bbf5323974134a SHA512 c1b715c46186009e27e25857c99cbd729fc49a1854dd987dcab53e4279528f19a1b9822dd1ca95162aa2a0b6627cf15ef6a692ad22c659dbd5c251fc3f898b7b
-DIST YAML-1.21.tar.gz 82995 BLAKE2B 91fa21da12188004ffa50da6bdcccac1efb94de2574d8a5a1b011390205e581c7cf24994c7214c84effcddb3603f4a378fc955de8199926c76269706aa2214d1 SHA512 1542c9a931a7c2c460cd89d66978747a6feee855993529b05638456ff4f16fa5273e539b7423e843d63ccfd29c650e2d46b9140388d44cc6c812a0e0c6be9cd3
-DIST YAML-1.23.tar.gz 83566 BLAKE2B 317d3d0b96e0050645385d8ab7868f6b04d41a3172d901b1ded66813c61cbd2ac28542086f79e322b7c9ad3220e03e1fe49f8a5b38c45015148dfe5da742e1fc SHA512 42dd2063e16b0e96a51ae9e43ed537741206529ff0df2939717eb142edf6396f69130b6b64d1d338d0c0a32dc11f68f3ffc5e0b5043c325c20e0d492626c106c
 DIST YAML-1.24.tar.gz 83296 BLAKE2B c15d041ee5004b5c9d13b994abb2aca1753aa8aad4f498eee82008a5476c84f844f3ab5d2d40ed2fc46c876e1ce51c8cd24b870e207a8bc4395e9b3aaecbbb6b SHA512 20ba196cf9c68a38154f68b884262b9f89463af5e67c1e59944070b2493f6d9515f92a2793f456e20fe7e6372b74da8f6c16b884274793b6c3aa0ed0134c340d
diff --git a/dev-perl/YAML/YAML-1.210.0.ebuild b/dev-perl/YAML/YAML-1.210.0.ebuild
deleted file mode 100644
index e2a534381b75..000000000000
--- a/dev-perl/YAML/YAML-1.210.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=INGY
-DIST_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="YAML Ain't Markup Language (tm)"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/Test-YAML-1.50.0
-	)
-"
-src_test() {
-	perl_rm_files t/author-*.t
-	perl-module_src_test
-}
diff --git a/dev-perl/YAML/YAML-1.230.0.ebuild b/dev-perl/YAML/YAML-1.230.0.ebuild
deleted file mode 100644
index e6921a04d4f6..000000000000
--- a/dev-perl/YAML/YAML-1.230.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=INGY
-DIST_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="YAML Ain't Markup Language (tm)"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/Test-YAML-1.50.0
-	)
-"
-src_test() {
-	perl_rm_files t/author-*.t
-	perl-module_src_test
-}
diff --git a/dev-perl/autobox/Manifest b/dev-perl/autobox/Manifest
index d10f3c895b1d..b127660d43c5 100644
--- a/dev-perl/autobox/Manifest
+++ b/dev-perl/autobox/Manifest
@@ -1,2 +1 @@
-DIST autobox-2.85.tar.gz 80443 BLAKE2B 1eff93ea1e8c80d38f597137cff128495f22744b07df4a28f510b3a8d0a3aaf20a1f550de173d8afc1a0370420b458b0eb5eef80752545a2e698d64d0659ec6b SHA512 2f9c0ef556655eb19a2e50aa2ec47769ef2fd7bb15806a7f22320be9d79178811c418dbe58cf792fdc48dc3e7b80b70c1882956559373cc6eb152c0b94d52081
 DIST autobox-2.86.tar.gz 85350 BLAKE2B fd4ef4a26efbec7542c4aa962787b032889603c789b1e892b00fa597efa8b74db6ce546710fbf02b5a497ba16c4aeb0f377b1d7baa5f2fa74b22a71f257d34b0 SHA512 ab4d41cfddb10a03e6bdb47a81cbf2a41f5c2f518dd674e9af17a3127589d8b4d84d50f4293291517fb24b9c1b022dfcecafd7acf5d0d1e693528353ccc9c186
diff --git a/dev-perl/autobox/autobox-2.850.0.ebuild b/dev-perl/autobox/autobox-2.850.0.ebuild
deleted file mode 100644
index 6d5c941f2f54..000000000000
--- a/dev-perl/autobox/autobox-2.850.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=CHOCOLATE
-DIST_VERSION=2.85
-inherit perl-module
-
-DESCRIPTION="Call methods on native types"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Scope-Guard-0.210.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 254db65acaff..eda854a842ae 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -34,9 +34,11 @@ python_prepare_all() {
 }
 
 python_test() {
+	local -x TZ=UTC
+
 	# Create implementation-specific datadir for tests.
 	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
-	py.test || die
+	py.test -vv || die
 }
 
 python_compile_all() {
diff --git a/dev-python/BitVector/BitVector-3.4.8.ebuild b/dev-python/BitVector/BitVector-3.4.8.ebuild
new file mode 100644
index 000000000000..8952469258c1
--- /dev/null
+++ b/dev-python/BitVector/BitVector-3.4.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index b29707f26c9f..895f1b3f6f29 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,3 +1,4 @@
 DIST BitVector-3.4.4.tar.gz 121822 BLAKE2B 1261a7b86130b15eeb3b9ab3565787e673ecb1ee908666eb7784d1da3052bd69b9878a7eeb50df49bfa0ff76b8f2f9d777517c254a320feca187161cf1820701 SHA512 b2310ef712c97538e29d008688efdc10269030bfdf7656733093dd4580ff4dfa171f6d58683c3a6336e909a020ba5100474e18997c1b2a0873a0da2e622ba9ff
 DIST BitVector-3.4.6.tar.gz 125137 BLAKE2B 877d2d855ce9eb9f1126df981c92dd8a7a475b15cbccc371ef4649692ac8b449a009d37ffd9c1fc70cd6147faf7758a18c6d83149a22786278f07eb3106a2de0 SHA512 56994692b7cd62f5790a1629d6a653f66f147e674dbc1a5f256dac4462c3eedf6363551165de940e4823d78462f63a44dce03ccd28073db1d93f2e2af436d0ab
 DIST BitVector-3.4.7.tar.gz 125013 BLAKE2B 8bd058c485d630755c0c06d4fee0e23c00a32a341d86f92aa22a48aaedf6ececb10bdae22e60a5bdb83f54c013fde8a914266deb64948ded0b2b95f5a4e4168c SHA512 5f9c9d13de6bec4b982a98564561b250152ba0ebdc119c75ddaf3822451dabe417d023fa529fd0ab8f583f86209369937b803d3ed0809ebeb312886504d96dfe
+DIST BitVector-3.4.8.tar.gz 126947 BLAKE2B 5033564af4b69b1191ff8317523067b739839e83ed6d9c2c7e3f0910f67635d9d6e8712fabd722971a4652afb6466ae08c7aebe711711e4503a08284f11eb28c SHA512 22d76c33d407b7ff2b0493ed4949189d7fc9ea8fd7497610014ede5f27756b5f91678a5f2da5db5e04f9e85e98378001d0edb5a8c2e3053083d18e547799f3f1
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fbc64c8df9ab..3ebdea6578ed 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index e4d10b4523ca..72e170e6895a 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,3 +1 @@
-DIST atomicwrites-0.1.8.tar.gz 14440 BLAKE2B 4357747a06e3c0c501735587549d7824aacc2edad79932130e706f0fbca71cc67f630f9ea8a0d5be57cf4022866f7d3703aae8bb6671149a42cb2d9523464644 SHA512 51c03f875adec409663badb94e3214858e6cd190aa07b8ffb4c35be1f3acaa8b5a341f62b45f814308dbfbd391fd32df24618df70c36f27737853852963af25a
-DIST atomicwrites-0.1.9.tar.gz 14475 BLAKE2B 68d69493b892e1c02a71ebaaf4a73919181185d3ad8aa3738e33fd62a494f91f1606c849e56c92979b1df47af67e52572c1109cc754568742863ee234be681d2 SHA512 d7bf742c3cb1d5eee4921fca225b5d22e0fe18f2948fb7af44bc6817fc2b5d267fca0d42371d44730d3b557a400f9d6ce250ac3a05e1ce1d3600ec6569fa7aa6
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
diff --git a/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild b/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild
deleted file mode 100644
index 34c067431910..000000000000
--- a/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes."
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst )
diff --git a/dev-python/atomicwrites/atomicwrites-0.1.9.ebuild b/dev-python/atomicwrites/atomicwrites-0.1.9.ebuild
deleted file mode 100644
index 8adfcb4284fd..000000000000
--- a/dev-python/atomicwrites/atomicwrites-0.1.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes."
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst )
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
new file mode 100644
index 000000000000..75fd01fc4968
--- /dev/null
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Atomic file writes"
+HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/atomicwrites/metadata.xml b/dev-python/atomicwrites/metadata.xml
index 362e3c538894..26b05060cf14 100644
--- a/dev-python/atomicwrites/metadata.xml
+++ b/dev-python/atomicwrites/metadata.xml
@@ -7,5 +7,6 @@
 	<upstream>
 		<remote-id type="github">untitaker/python-atomicwrites</remote-id>
 		<remote-id type="pypi">atomicwrites</remote-id>
+		<bugs-to>https://github.com/untitaker/python-atomicwrites/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 704e2cea054d..b229fcaa535b 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,2 +1,3 @@
 DIST autopep8-1.3.2.tar.gz 107915 BLAKE2B 3148f12616babc26415fc138d5d9e2d2a83cc735449cea54870662dabdfebfd298d96ca716ee62c9143049a2abf05e6a597b0ec6bab90c557dae63999794ea25 SHA512 cb9a5e297ce705722d5e65472dbe749e57fa12fe8dee0d4c3dc20d9e885e0d885339627667110318c89c6bf7e337203a7831c0e2217e5a5d7951edcb98d3df4f
 DIST autopep8-1.3.3.tar.gz 108639 BLAKE2B d2e6f6f334dfeb5e8ae33f4460c9344ec6b1e234e7f714c7602fae72f1ca5608e12145c40a39b14d28e1d79b0dd91855493d87947407428ba4c1d87834156626 SHA512 e327d58311f74c8bb9f18b99f8d866c071166e94f43912b35eedc6062267d4cdb5842bde7c54426c751b1bb76103ec11eb8daa682772a1f71c50962811dbc694
+DIST autopep8-1.3.5.tar.gz 109415 BLAKE2B e30a9719dcb2ce5463adc967ea76daa1c919c4b26e879ad69416e06bdff873e288b43a86f2cd797e67428c969e60dfb1f63508bbd8eec8f818f2abd4f68409e9 SHA512 3f7b441ede0efe01b3123e9349eeddc1eb62e6198c79e95e7eee532a3c9eca0cedfd4fdb50a872da9be93ad79db68fb13972eb984539f9ca4ebc37b05411cf70
diff --git a/dev-python/autopep8/autopep8-1.3.5.ebuild b/dev-python/autopep8/autopep8-1.3.5.ebuild
new file mode 100644
index 000000000000..9dbeed092902
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.3.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent UnicodeDecodeError with LANG=C
+	sed -e "/é/d" -i MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 563d643c1612..f584e8e98e41 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,2 +1,2 @@
-DIST backports.unittest_mock-1.2.1.tar.gz 4580 BLAKE2B c935c378bae1f39e0658f4be027bcdbc13ecad6aeae93ca46ca314378f3c0462ea95b7b36daebdafd0577269520adb51a9f4cb7e74e9ab22c1bb6891d06c2384 SHA512 36218fe1117d62cc1aeea576c6220be7b8dd76b800776001756d157528ff7760791c513751a221ba84790c5b60b8ce62ab2ef17f4d359dd026211dc9c5cbcd5e
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
+DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1-r1.ebuild
deleted file mode 100644
index 1b2fb371978e..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="doc test"
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild
deleted file mode 100644
index b672aade0145..000000000000
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# It is the developer's intention that backports.unittest_mock will be
-# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_PN="${MY_PN//-/_}"
-DESCRIPTION="Backport of unittest.mock"
-HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/mock[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
new file mode 100644
index 000000000000..63a89653734a
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	py.test -v --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 6a90b43f53e3..b35a7789de3d 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1 +1,2 @@
 DIST bitarray-0.8.1.tar.gz 46877 BLAKE2B eb6b78706b336c73cb9895bfa2645fdc2d8a2525b23610bd37dc959a0aa2bad0c5d746ee31c53ca73a0248f989e69e23ef173dbe9dc0848453e6a8a5b14b3704 SHA512 10f4872243b92cd5a1a77e1e2aca80135d31904e17cb3de4eb2c3f2c4d3f00ad0573b6bc4b9c9379594e2912cb0e5d5870fb4e59eb298e269ecb3778fbae7d1f
+DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
new file mode 100644
index 000000000000..f20885fce729
--- /dev/null
+++ b/dev-python/bitarray/bitarray-0.8.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+
+python_test() {
+	"${PYTHON}" ${PN}/test_${PN}.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index af72c42e2da1..127b1050ae0c 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,2 +1,2 @@
-DIST denonavr-0.7.2.tar.gz 61673 BLAKE2B 98de89e385f51d6a13e1b365074a8bed7303fb4e666c608f547f9f515924539d6f54349483f4a78ed8968295cb1c3196e8713c05f1e10aca7ad290f6114bb29c SHA512 941f8133e19c41df9525f4a9c705ce4dc7a35eef493fa465df52a50fb752f6d23818c7046b7e8281af58b285f65b983bead1c77f49c61fd47743984a4a3f6a4a
 DIST denonavr-0.7.3.tar.gz 61735 BLAKE2B 5a6a8fab2f416cb34ac3078cc65fa92342de81a21f1710f6460fb00c1d255d7a5e208d3d9f9904c063004456e6e3447a08c677b95fc216bab1153060bafa8dd2 SHA512 51d559bf0db1ca9fcd6239046d2c2a149ac22e99aec331f10c7c6d59b2c9290aa66477093f4e707caf24f9ff78572659c3ffe2c9d508a28b344a1838e8cdee5d
+DIST denonavr-0.7.4.tar.gz 61901 BLAKE2B 70e4ba2b261d2007f80e52c43bf3fca4b41d2e53067e82aa46010334450b2a81723045f377956340d7b7d4388e829b8648a267a89c7ba69fd1ce28ca1f42ca10 SHA512 7ac9a25ecb46f0556acf48c1427154d3282a59185640aa85f2ae5d638d4b7fffea5b53a1964c621751e42d1d45fd6a6d5c273e1c850e2e473159bd099394e24e
diff --git a/dev-python/denonavr/denonavr-0.7.2.ebuild b/dev-python/denonavr/denonavr-0.7.2.ebuild
deleted file mode 100644
index 72d511138a45..000000000000
--- a/dev-python/denonavr/denonavr-0.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	py.test ||  die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/denonavr/denonavr-0.7.4.ebuild b/dev-python/denonavr/denonavr-0.7.4.ebuild
new file mode 100644
index 000000000000..4a3aab119639
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.7.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 8be2a1383ed9..7585d057e661 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,7 +1,3 @@
 DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-DIST docker-py-3.1.4.tar.gz 202064 BLAKE2B 6ee3672cd1f62cd570d3939805465698879d747215b8424bc4edd79253c5bc25d193582dbfa6aa423f9b183d477486d6347f65ac7245d601d3f1fe2a1fd124ed SHA512 78081010ce4027156d3b4ebafee6023f387ee8e7ee4d77ee671a16a3fcb646fca91c5c36cfbaf94157f8a524a3e1a09b9cbfabf304e278a3c1e0132df5d13d13
-DIST docker-py-3.2.0.tar.gz 205546 BLAKE2B 0784408a0373721e30cc101bf9e20e93af4721ace3841721b851efa49874163a1684239db6a56b7e91e83ad77eb4290dde61f53d70d6656853cedaff95da90b2 SHA512 fa36b65a047aec6dbec07b2ee5ac895b333acc804e372b5b3ccae587045fa03613f4083c66cd6289e188fd78c6f7012c4252e9bbf9f30a980fb94f32efba03b7
-DIST docker-py-3.2.1.tar.gz 205815 BLAKE2B fc9b23f57f64e3d25a922b896619f3d03780d446f03adb987c6a203df2c41fbc03b202cc8dac30392158dd0da4d600372b6af284d785179c0cf58f7048735da3 SHA512 c66f960bd507d8c4ed99e56480c24d11b13cf49420eee2f0934cede7516a8a9b984e5e0540a1d82d830768d3a5f0218dddd61255d55e7bd1b984072cd6e48a44
-DIST docker-py-3.3.0.tar.gz 206523 BLAKE2B dd5b1edda8b4c31c3febcedf8352262f090c6232419a0751181c1e765220905b93b50f26091123c31b7193aeb5d94e30f1ba49d114d1c2006a2c60ebaca80865 SHA512 ed2dedd57df344ab576053ac6d458808c67ce5aeeacddb1729ea5ebd0fb741e8f08cf9ed472e28d40eaba3a45f6c26727bff0ab7ece832bc3238f441ed149c05
-DIST docker-py-3.4.0.tar.gz 207877 BLAKE2B b9a1d95f934fddc576253f9bb1d3060feaf9671d7bfa16e2c8ce2e672407dd880fa20b0e6956ff49430a20c21fdec2bf44d2a07e49ad854b374ea518a7528464 SHA512 90e6e64a911f7602cb71f7b6f0e0174b490254f249fcf3d4ce55a8733391881cc12776737c240263f387c4465707c50a6fa54bf44550cfa7ada808614494a1a5
+DIST docker-py-3.4.1.tar.gz 207885 BLAKE2B 472f5dde4761b02a2b55c64762a0529dbaecc8aa9f0e24c67770f533341a5ca9c7322bfacba81f99f9305f09d4e5f7d7ccf37201f5e987777c33c6f81552a807 SHA512 447dccb9129d549886882e6cf0a8ac56d91f7ed57b6aa1dca1942c62d70dc78b92184cbdd9ac5f3445be04cfaadf0b4fba191fb70e223e93c6d1cfbfd334a397
diff --git a/dev-python/docker-py/docker-py-3.1.4.ebuild b/dev-python/docker-py/docker-py-3.1.4.ebuild
deleted file mode 100644
index 8108a4abde8e..000000000000
--- a/dev-python/docker-py/docker-py-3.1.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.2.0.ebuild b/dev-python/docker-py/docker-py-3.2.0.ebuild
deleted file mode 100644
index 8108a4abde8e..000000000000
--- a/dev-python/docker-py/docker-py-3.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.2.1.ebuild b/dev-python/docker-py/docker-py-3.2.1.ebuild
deleted file mode 100644
index 8108a4abde8e..000000000000
--- a/dev-python/docker-py/docker-py-3.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.3.0.ebuild b/dev-python/docker-py/docker-py-3.3.0.ebuild
deleted file mode 100644
index 8ce9ced05031..000000000000
--- a/dev-python/docker-py/docker-py-3.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.3[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.4.0.ebuild b/dev-python/docker-py/docker-py-3.4.0.ebuild
deleted file mode 100644
index 8ce9ced05031..000000000000
--- a/dev-python/docker-py/docker-py-3.4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.3[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.4.1.ebuild b/dev-python/docker-py/docker-py-3.4.1.ebuild
new file mode 100644
index 000000000000..d3e8810d7e69
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.3.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
index c9e99c9f99d4..eaa6fadea4b1 100644
--- a/dev-python/docker-pycreds/Manifest
+++ b/dev-python/docker-pycreds/Manifest
@@ -1,3 +1,3 @@
 DIST docker-pycreds-0.2.1.tar.gz 7555 BLAKE2B e9934a357cb59d995971f0d3b247e6d84efb9c105cbd71792b536fd98088a6e658361e9621360b79a3a1041cea3f063fb66d58124cca717d003f9253e2c8e908 SHA512 04a2dbd00c4e0a02bee13eaf23255e660b0e8640ef4225eff94e6c2391e5ceaf539b373ef932737dbc8eb4383746b374aca5a018a1f21c1eebb2f53160662338
-DIST docker-pycreds-0.2.2.tar.gz 7787 BLAKE2B 4ab61bc9bb3f9f75667e7d74212a8e83d214bf2210e200abad593ded94aae8290b216edd28cf2304a8d8d6192faba0b3b764bbfc0f2a446efceaf33558849b84 SHA512 dc0394f7cc34b36b6a7edd61fa5937743da573d14b75f7ed06ca9d5c15a980d7c43252e846e529e2bc799e7f7b72fb1f4ca03b28c2677cc38afbfda16fbbcb55
 DIST docker-pycreds-0.2.3.tar.gz 8220 BLAKE2B db645de930becc3ad6ecb2d6476d36d1845fbaa55b7c6d2d6590e45036713b6e215b189e6ea961c31c0898e8f231943e05abe96a63c15ac43bebf0f7787b954b SHA512 d4199a48a0bda29ac6126ca9a196c0722667a744998b5f81b360066d48f1bd1f9e6e423df2b53e37117316f3dada6fa47e956c6d2c7d90f851d97a434dcb595f
+DIST docker-pycreds-0.3.0.tar.gz 8544 BLAKE2B 88a950d7fa027b221ffd999283cb6ee4b0f23115167f27f163085372abccc4d9d5dfeb03ab5d99449d607dc69212bfeb870130d0f91843cca6b9b338d0f4f9ad SHA512 5fa81b375c3ddb6527f416afb11688cb703f75dbd3b1a9efba0cf85e8b3deb903670c94933777b855d48d607596192c72e4d5be96f91ac8e8334e634abf8d2fa
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.2.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
similarity index 100%
rename from dev-python/docker-pycreds/docker-pycreds-0.2.2.ebuild
rename to dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
diff --git a/dev-python/freezegun/files/freezegun-0.3.10-py37.patch b/dev-python/freezegun/files/freezegun-0.3.10-py37.patch
new file mode 100644
index 000000000000..aa3bd536e09e
--- /dev/null
+++ b/dev-python/freezegun/files/freezegun-0.3.10-py37.patch
@@ -0,0 +1,58 @@
+From 4fdad69659f15a9e62cf4f6c15c9f319276cf9b0 Mon Sep 17 00:00:00 2001
+From: Jonas Obrist <jonas.obrist@hde.co.jp>
+Date: Tue, 6 Mar 2018 12:21:38 +0900
+Subject: [PATCH] add support for Python 3.7 uuid module changes
+
+Python 3.7 removed uuid._uuid_generate_time. It now has
+uuid._load_system_functions and uuid._generate_time_safe.
+_generate_time_safe is set by calling _load_system_functions (subsequent
+calls to that function are no-op). This change detects the missing
+uuid._uuid_generate_time attribute and uses the new attribute/function
+if they're missing.
+---
+ freezegun/api.py | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/freezegun/api.py b/freezegun/api.py
+index eb09932..a88a392 100644
+--- a/freezegun/api.py
++++ b/freezegun/api.py
+@@ -27,8 +27,14 @@ _real_time_object_ids = set(id(obj) for obj in real_date_objects)
+ 
+ try:
+     real_uuid_generate_time = uuid._uuid_generate_time
+-except (AttributeError, ImportError):
++    uuid_generate_time_attr = '_uuid_generate_time'
++except AttributeError:
++    uuid._load_system_functions()
++    real_uuid_generate_time = uuid._generate_time_safe
++    uuid_generate_time_attr = '_generate_time_safe'
++except ImportError:
+     real_uuid_generate_time = None
++    uuid_generate_time_attr = None
+ 
+ try:
+     real_uuid_create = uuid._UuidCreate
+@@ -482,7 +488,8 @@ class _freeze_time(object):
+         time.localtime = fake_localtime
+         time.gmtime = fake_gmtime
+         time.strftime = fake_strftime
+-        uuid._uuid_generate_time = None
++        if uuid_generate_time_attr:
++            setattr(uuid, uuid_generate_time_attr, None)
+         uuid._UuidCreate = None
+         uuid._last_timestamp = None
+ 
+@@ -573,7 +580,8 @@ class _freeze_time(object):
+         time.localtime = time.localtime.previous_localtime_function
+         time.strftime = time.strftime.previous_strftime_function
+ 
+-        uuid._uuid_generate_time = real_uuid_generate_time
++        if uuid_generate_time_attr:
++            setattr(uuid, uuid_generate_time_attr, real_uuid_generate_time)
+         uuid._UuidCreate = real_uuid_create
+         uuid._last_timestamp = None
+ 
+-- 
+2.18.0
+
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index f604d233c5f2..1c2d176046c3 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/freezegun-0.3.10-py37.patch
+)
+
 python_test() {
 	nosetests -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/ipython/ipython-5.4.1-r1.ebuild b/dev-python/ipython/ipython-5.4.1-r1.ebuild
new file mode 100644
index 000000000000..787088fd8d66
--- /dev/null
+++ b/dev-python/ipython/ipython-5.4.1-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )
+"
+
+RDEPEND="${CDEPEND}
+	virtual/python-pathlib[${PYTHON_USEDEP}]
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
+	virtual/python-typing[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
deleted file mode 100644
index b582ab8ce93b..000000000000
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )
-"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	dev-python/typing[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-6.1.0-r1.ebuild b/dev-python/ipython/ipython-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..d89e54743ec2
--- /dev/null
+++ b/dev-python/ipython/ipython-6.1.0-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 smp test"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	)
+"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-6.1.0.ebuild b/dev-python/ipython/ipython-6.1.0.ebuild
deleted file mode 100644
index a21490ed5671..000000000000
--- a/dev-python/ipython/ipython-6.1.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 smp test"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	)
-"
-
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-#DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
deleted file mode 100644
index 7511b164b272..000000000000
--- a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_PN="M2Crypto"
-
-DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl:0= )
-	dev-python/typing[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.28:0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-version-check.patch"
-)
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	# https://bugs.gentoo.org/617946
-	# TODO: Fix cross-compiles
-	local -x SWIG_FEATURES=
-	case ${ABI} in
-		x32) SWIG_FEATURES="-D__ILP32__" ;;
-	esac
-	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.27.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.27.0-r2.ebuild
new file mode 100644
index 000000000000..84bdf24cfb7d
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.27.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-version-check.patch"
+)
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	# https://bugs.gentoo.org/617946
+	# TODO: Fix cross-compiles
+	local -x SWIG_FEATURES=
+	case ${ABI} in
+		x32) SWIG_FEATURES="-D__ILP32__" ;;
+	esac
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
index 34bf69ba7e38..e1df10b50d73 100644
--- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
@@ -23,7 +23,7 @@ IUSE="libressl"
 RDEPEND="
 	!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] )
 	libressl? ( dev-libs/libressl:0= )
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-1.3.28:0
diff --git a/dev-python/promises/promises-2.0.1-r1.ebuild b/dev-python/promises/promises-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..ab5cb29c06fe
--- /dev/null
+++ b/dev-python/promises/promises-2.0.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN%s}-${PV}
+
+DESCRIPTION="An implementation of Promises in Python"
+HOMEPAGE="https://github.com/syrusakbary/promise"
+SRC_URI="https://github.com/syrusakbary/${PN%s}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/python-typing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+RESTRICT=test
+# TODO: When we get all the dependencies in, we can add test
+#	test? (
+#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+#		dev-python/pytest-cov[${PYTHON_USEDEP}]
+#		dev-python/coveralls[${PYTHON_USEDEP}]
+#		dev-python/futures[${PYTHON_USEDEP}]
+#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#	)
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/promises/promises-2.0.1.ebuild b/dev-python/promises/promises-2.0.1.ebuild
deleted file mode 100644
index 9e7b96f9b846..000000000000
--- a/dev-python/promises/promises-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${PN%s}-${PV}
-
-DESCRIPTION="An implementation of Promises in Python"
-HOMEPAGE="https://github.com/syrusakbary/promise"
-SRC_URI="https://github.com/syrusakbary/${PN%s}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/typing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-RESTRICT=test
-# TODO: When we get all the dependencies in, we can add test
-#	test? (
-#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/coveralls[${PYTHON_USEDEP}]
-#		dev-python/futures[${PYTHON_USEDEP}]
-#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#	)
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/promises/promises-2.1-r1.ebuild b/dev-python/promises/promises-2.1-r1.ebuild
new file mode 100644
index 000000000000..d383755c08b5
--- /dev/null
+++ b/dev-python/promises/promises-2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+MY_PN=${PN%s}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An implementation of Promises in Python"
+HOMEPAGE="https://github.com/syrusakbary/promise"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/python-typing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+RESTRICT=test
+# TODO: When we get all the dependencies in, we can add test
+#	test? (
+#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+#		dev-python/pytest-cov[${PYTHON_USEDEP}]
+#		dev-python/coveralls[${PYTHON_USEDEP}]
+#		dev-python/futures[${PYTHON_USEDEP}]
+#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#	)
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/promises/promises-2.1.ebuild b/dev-python/promises/promises-2.1.ebuild
deleted file mode 100644
index 5a444b8ed99a..000000000000
--- a/dev-python/promises/promises-2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_PN=${PN%s}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An implementation of Promises in Python"
-HOMEPAGE="https://github.com/syrusakbary/promise"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/typing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-RESTRICT=test
-# TODO: When we get all the dependencies in, we can add test
-#	test? (
-#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/coveralls[${PYTHON_USEDEP}]
-#		dev-python/futures[${PYTHON_USEDEP}]
-#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#	)
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pyfire/pyfire-0.3.4-r1.ebuild b/dev-python/pyfire/pyfire-0.3.4-r1.ebuild
deleted file mode 100644
index 620b2235a9c1..000000000000
--- a/dev-python/pyfire/pyfire-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A python implementation of the Campfire API"
-HOMEPAGE="http://www.pyfire.org/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pyfire/pyfire-0.3.4-r2.ebuild b/dev-python/pyfire/pyfire-0.3.4-r2.ebuild
new file mode 100644
index 000000000000..be8374a0c348
--- /dev/null
+++ b/dev-python/pyfire/pyfire-0.3.4-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A python implementation of the Campfire API"
+HOMEPAGE="https://github.com/mariano/pyfire"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
new file mode 100644
index 000000000000..28d40e9566a2
--- /dev/null
+++ b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Miro Hrončok <miro@hroncok.cz>
+# Date 1530720528 -7200
+# Branch py37
+# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87
+# Parent  7941677dc77d4f2bf0bbd6140ade85a9454b8b80
+PEP 479: Raising StopIteration from a generator is now an error
+
+So we return instead. Fix needed for Python 3.7.
+
+Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457
+
+diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
+--- a/pygments/lexers/lisp.py
++++ b/pygments/lexers/lisp.py
+@@ -2327,13 +2327,13 @@
+             token = Name.Function if token == Literal else token
+             yield index, token, value
+ 
+-        raise StopIteration
++        return
+ 
+     def _process_signature(self, tokens):
+         for index, token, value in tokens:
+             if token == Literal and value == '}':
+                 yield index, Punctuation, value
+-                raise StopIteration
++                return
+             elif token in (Literal, Name.Function):
+                 token = Name.Variable if value.istitle() else Keyword.Type
+             yield index, token, value
+diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
+--- a/pygments/lexers/sql.py
++++ b/pygments/lexers/sql.py
+@@ -347,7 +347,10 @@
+             # Emit the output lines
+             out_token = Generic.Output
+             while 1:
+-                line = next(lines)
++                try:
++                    line = next(lines)
++                except StopIteration:
++                    return
+                 mprompt = re_prompt.match(line)
+                 if mprompt is not None:
+                     # push the line back to have it processed by the prompt
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index 07dcfb618418..d9da923f8cdf 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -32,6 +32,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# fix generators for python3.7+
+	"${FILESDIR}"/pygments-2.2.0-pep479.patch
+)
+
 python_compile_all() {
 	use doc && emake -C doc html
 }
diff --git a/dev-python/python-afl/Manifest b/dev-python/python-afl/Manifest
index 9cc1353d4343..730d1b9e5871 100644
--- a/dev-python/python-afl/Manifest
+++ b/dev-python/python-afl/Manifest
@@ -1 +1,2 @@
 DIST python-afl-0.6.1.tar.gz 14795 BLAKE2B 7899ffb9ee2d0afa82a4621d7c26acd3f19f4711480f4d85a60007d7739f3dcac99a787bc7dea33d2b336e117320cef69037a20c54771ead695eae1771f2b7cb SHA512 25662ae96db23560ab0f7df1468f1a4737f8f68853bed75cfcfe6112a6fac110501c66941402f35686d6b96a6d124a2aeeaed79052d618583843528cb3eee3aa
+DIST python-afl-0.7.1.tar.gz 16045 BLAKE2B 05d0aba389dcdcc11b6ec789f12f8d282b6d2fa4f1706795832468d92aa1c5e9e1c829ed7e5bfaf77bec011098cf9fe30b67c9ac2ce66c0ad5bd84a6c3037f47 SHA512 e0b8d65378d41d8ba654c8b6f3d03822ac18543cb91fb650f35d490c4b72be6b038d1a13341a33cbdde2102ad92a7e533e5c8ade9a9f13d32c78a774d5e7f120
diff --git a/dev-python/python-afl/python-afl-0.7.1.ebuild b/dev-python/python-afl/python-afl-0.7.1.ebuild
new file mode 100644
index 000000000000..bf8b847ba196
--- /dev/null
+++ b/dev-python/python-afl/python-afl-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Enables American fuzzy lop fork server and instrumentation for pure-Python code"
+HOMEPAGE="https://github.com/jwilk/python-afl http://jwilk.net/software/python-afl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="app-forensics/afl"
+DEPEND=">=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	PATH="${PATH}:." nosetests --verbose || die
+}
diff --git a/dev-python/sphinx/sphinx-1.6.3-r3.ebuild b/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
deleted file mode 100644
index 551ff31244cf..000000000000
--- a/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.3-r4.ebuild b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
new file mode 100644
index 000000000000..7f1d945977a5
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.6.5-r1.ebuild b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
new file mode 100644
index 000000000000..ad810d050f81
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5.ebuild
deleted file mode 100644
index 340cc9bfdfef..000000000000
--- a/dev-python/sphinx/sphinx-1.6.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.7-r1.ebuild b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
new file mode 100644
index 000000000000..dbbac7ab54b8
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.6.7.ebuild b/dev-python/sphinx/sphinx-1.6.7.ebuild
deleted file mode 100644
index c00c5313640f..000000000000
--- a/dev-python/sphinx/sphinx-1.6.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..86a61f664a74
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
+
+	# fails when additional sphinx themes are installed
+	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	py.test -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx/sphinx-1.7.5.ebuild b/dev-python/sphinx/sphinx-1.7.5.ebuild
deleted file mode 100644
index e9a69465dfe3..000000000000
--- a/dev-python/sphinx/sphinx-1.7.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index b58ad51090cf..438d76f70b39 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1 +1,2 @@
 DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
+DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
new file mode 100644
index 000000000000..36f4308b2e8e
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx websupport extension"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+# avoid circular dependency with sphinx
+PDEPEND="
+	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		${PDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 461ef1e525b3..ca87c8354c23 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -9,3 +9,4 @@ DIST SQLAlchemy-1.2.0.tar.gz 5451303 BLAKE2B 273edad173583d47d6ebdb4d3efddddb6e8
 DIST SQLAlchemy-1.2.2.tar.gz 5460157 BLAKE2B 60c5066a2993d9878f5d3abec1a6a9a4d0a3dc5878df71baee895e5278b95696b775e16000da0ba4c2c358b0a90e70faff0b5733a4f00255b0ec0d605cdd07c6 SHA512 060ce803b8b621d51aa69100c598c424c36f051bdce1e2df3f4d837815f91cb55c4e089db5375b01832ec28bf42332311009c51c1b5e7aae92aea001ee880db5
 DIST SQLAlchemy-1.2.4.tar.gz 5555033 BLAKE2B 5301d365cf6462b8a61deb3f01dcf86897c0070fe80f570b91f94a02e1830088b558004d915d17589dfaea1e5fd382fdf88c44020f3b3b94974db773b5ed2db6 SHA512 a12d17f222cc5fc4360c439e19cae67a013af07e2c22b1f55511c4862d718578249e6bf83151eefe35957e530dbf18a565b08cded3a5e45dd21103201f4d24e8
 DIST SQLAlchemy-1.2.7.tar.gz 5571719 BLAKE2B 995c977cd5bf22b464e5316d579a3bd5b15f2c2600230c729381f3dbecd1dd6a728ee08d5e8afa8e212bdc7e5272d8723706daed1db0ec353e3b56f5b9c614d7 SHA512 c592916dae177bcda7b3d7111af4269815d555273b548e35b58caaf518f7a5dc2256e5b98601cbbf0bbc95405fadd89f8e6b977e0d8104ce4e216d5c6924eda2
+DIST SQLAlchemy-1.2.9.tar.gz 5606090 BLAKE2B 7aade70c37a6e9afb1e459c88ea0d1ef927541d3ff8c64a634f81ba871fb9d0d14841e1c7a1ed28c12cb7a4d84d6ede6bf132f54d47019967fec8acd55757c33 SHA512 88ef57b9e456d7047bd7b5fd9607c87a473a9917d662960b0614fbfc40891002309eda55e66e42a6a280c6d6e7e8e6921349901a19c1caaedace2d532b32af22
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild
new file mode 100644
index 000000000000..4a8b2a2bac4f
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		<dev-python/pluggy-0.7s[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pytest -vv test || die "Testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 6955aee18da5..81df8618ccee 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -14,14 +14,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+IUSE="test"
 
 RDEPEND="
 	dev-python/testtools[${PYTHON_USEDEP}]"
 
+# using pytest for tests since unittest loader fails with py3.5+
 DEPEND="
 	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	# Remove a faulty file from tests, missing a required attribute
@@ -30,5 +33,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
deleted file mode 100644
index fd65b4cd6f53..000000000000
--- a/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 25f4800d62f339f81b09c894275a3af4b284fb62 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@canonical.com>
-Date: Wed, 19 Aug 2015 03:06:09 +0100
-Subject: [PATCH] Port twisted.deferredruntest to Twisted >= 15.1.0
-
-Twisted 15.1.0 removes the compatibility import of _LogObserver in
-twisted.trial.unittest.  This is unfortunate for us, but it's what we
-get for using an internal interface.  It at least still exists in
-twisted.trial._synctest, so we can get it from there.
-
-Twisted 15.2.0 adds the new twisted.logger framework, which requires a
-slight adjustment to run_with_log_observers.  There's no longer a
-supported interface to get hold of all log observers, but since we're
-already using an internal interface (see above), what's one more?
-
-This passes "make check" with the current release, Twisted 15.3.0.
----
- testtools/deferredruntest.py | 27 +++++++++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/testtools/deferredruntest.py b/testtools/deferredruntest.py
-index c33e14a..04cdb0f 100644
---- a/testtools/deferredruntest.py
-+++ b/testtools/deferredruntest.py
-@@ -27,8 +27,15 @@
-     )
- 
- from twisted.internet import defer
-+try:
-+    from twisted.logger import globalLogPublisher
-+except ImportError:
-+    globalLogPublisher = None
- from twisted.python import log
--from twisted.trial.unittest import _LogObserver
-+try:
-+    from twisted.trial.unittest import _LogObserver
-+except ImportError:
-+    from twisted.trial._synctest import _LogObserver
- 
- 
- class _DeferredRunTest(RunTest):
-@@ -53,9 +60,21 @@ def _run_user(self, function, *args):
- 
- def run_with_log_observers(observers, function, *args, **kwargs):
-     """Run 'function' with the given Twisted log observers."""
--    real_observers = list(log.theLogPublisher.observers)
-+    if globalLogPublisher is not None:
-+        # Twisted >= 15.2.0, with the new twisted.logger framework.
-+        # log.theLogPublisher.observers will only contain legacy observers;
-+        # we need to look at globalLogPublisher._observers, which contains
-+        # both legacy and modern observers, and add and remove them via
-+        # globalLogPublisher.  However, we must still add and remove the
-+        # observers we want to run with via log.theLogPublisher, because
-+        # _LogObserver may consider old keys and require them to be mapped.
-+        publisher = globalLogPublisher
-+        real_observers = list(publisher._observers)
-+    else:
-+        publisher = log.theLogPublisher
-+        real_observers = list(publisher.observers)
-     for observer in real_observers:
--        log.theLogPublisher.removeObserver(observer)
-+        publisher.removeObserver(observer)
-     for observer in observers:
-         log.theLogPublisher.addObserver(observer)
-     try:
-@@ -64,7 +83,7 @@ def run_with_log_observers(observers, function, *args, **kwargs):
-         for observer in observers:
-             log.theLogPublisher.removeObserver(observer)
-         for observer in real_observers:
--            log.theLogPublisher.addObserver(observer)
-+            publisher.addObserver(observer)
- 
- 
- # Observer of the Twisted log that we install during tests.
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
deleted file mode 100644
index c1eb11b1f5ab..000000000000
--- a/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6d821b5770b01f5ec98c3b8db734fffeebf12b62 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@canonical.com>
-Date: Mon, 24 Aug 2015 13:21:57 +0100
-Subject: [PATCH] Test with Twisted 13.0.0/15.2.0.
-
----
- .travis.yml | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 41036f8..a706b27 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -7,6 +7,10 @@ python:
-   - "3.4"
-   - "pypy"
- 
-+env:
-+  - TWISTED="==13.0.0"
-+  - TWISTED="==15.2.0"
-+
- # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
- # http://jinja.pocoo.org/docs/changelog/#version-2-7
- # And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
-@@ -23,7 +27,7 @@ matrix:
-       env: SPHINX="<1.3"
- 
- install:
--  - pip install fixtures $JINJA_REQ sphinx$SPHINX
-+  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
-   - python setup.py install
- 
- script:
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
deleted file mode 100644
index df5d91f9b681..000000000000
--- a/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2e03ffaff15bc5d83c5f6d092aab4072f166aca0 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@canonical.com>
-Date: Mon, 24 Aug 2015 13:45:01 +0100
-Subject: [PATCH] Only run Twisted tests on Python 2.
-
----
- .travis.yml | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a706b27..bc007f2 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -7,27 +7,37 @@ python:
-   - "3.4"
-   - "pypy"
- 
--env:
--  - TWISTED="==13.0.0"
--  - TWISTED="==15.2.0"
--
- # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
- # http://jinja.pocoo.org/docs/changelog/#version-2-7
--# And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
-+# And Sphinx to < 1.3 for pypy3 and python 3.2 similarly.
- #
- # See also:
- # http://stackoverflow.com/questions/18252804/syntax-error-in-jinja-2-library
-+#
-+# Twisted tests currently only work on Python 2.
- matrix:
-   include:
-+    - python: "2.6"
-+      env:
-+        - TWISTED_REQ="Twisted==13.0.0"
-+        - TWISTED_REQ="Twisted==15.2.0"
-+    - python: "2.7"
-+      env:
-+        - TWISTED_REQ="Twisted==13.0.0"
-+        - TWISTED_REQ="Twisted==15.2.0"
-     - python: "3.2"
-       env:
-         - JINJA_REQ="jinja2<2.7, Pygments<2.0"
-         - SPHINX="<1.3"
-+    - python: "pypy"
-+      env:
-+        - TWISTED_REQ="Twisted==13.0.0"
-+        - TWISTED_REQ="Twisted==15.2.0"
-     - python: "pypy3"
-       env: SPHINX="<1.3"
- 
- install:
--  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
-+  - pip install fixtures $JINJA_REQ sphinx$SPHINX $TWISTED_REQ
-   - python setup.py install
- 
- script:
diff --git a/dev-python/testtools/files/testtools-2.3.0-py37.patch b/dev-python/testtools/files/testtools-2.3.0-py37.patch
new file mode 100644
index 000000000000..0f2da043ffe9
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.3.0-py37.patch
@@ -0,0 +1,44 @@
+https://github.com/testing-cabal/testtools/commit/29004731f9c480b7c44a9c2605513d50d372898f.patch
+
+From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 17 May 2018 17:52:26 +0200
+Subject: [PATCH] Fix the tests on Python 3.7
+
+Exception's repr got changed not to include trailing comma
+
+Fixes https://github.com/testing-cabal/testtools/issues/270
+---
+ .travis.yml                                |  1 +
+ testtools/tests/matchers/test_exception.py | 11 +++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
+index 6cd80af1..acd39252 100644
+--- a/testtools/tests/matchers/test_exception.py
++++ b/testtools/tests/matchers/test_exception.py
+@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
+     matches_matches = [error_foo]
+     matches_mismatches = [error_bar, error_base_foo]
+ 
++    if sys.version_info >= (3, 7):
++        # exception's repr has changed
++        _e = ''
++    else:
++        _e = ','
++
+     str_examples = [
+-        ("MatchesException(Exception('foo',))",
++        ("MatchesException(Exception('foo'%s))" % _e,
+          MatchesException(Exception('foo')))
+         ]
+     describe_examples = [
+         ("%r is not a %r" % (Exception, ValueError),
+          error_base_foo,
+          MatchesException(ValueError("foo"))),
+-        ("ValueError('bar',) has different arguments to ValueError('foo',).",
++        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
++         % (_e, _e),
+          error_bar,
+          MatchesException(ValueError("foo"))),
+         ]
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index 0ec501a3f0e0..e37da41b3e77 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ DEPEND="
 RDEPEND="${CDEPEND}"
 PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}"/testtools-2.3.0-py37.patch
+)
+
 python_compile_all() {
 	use doc && emake -C doc html
 }
diff --git a/dev-python/typing/typing-3.6.2-r1.ebuild b/dev-python/typing/typing-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..fa97ca9e4dac
--- /dev/null
+++ b/dev-python/typing/typing-3.6.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Type Hints for Python"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
+		cd "${S}"/python2 || die
+	else
+		cd "${S}"/src || die
+	fi
+
+	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/typing/typing-3.6.2.ebuild b/dev-python/typing/typing-3.6.2.ebuild
deleted file mode 100644
index ebb1665c5afc..000000000000
--- a/dev-python/typing/typing-3.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
-		cd "${S}"/python2 || die
-	else
-		cd "${S}"/src || die
-	fi
-
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing/typing-3.6.4-r1.ebuild b/dev-python/typing/typing-3.6.4-r1.ebuild
new file mode 100644
index 000000000000..a2f4c6da829e
--- /dev/null
+++ b/dev-python/typing/typing-3.6.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Type Hints for Python"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
+		cd "${S}"/python2 || die
+	else
+		cd "${S}"/src || die
+	fi
+
+	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/typing/typing-3.6.4.ebuild b/dev-python/typing/typing-3.6.4.ebuild
deleted file mode 100644
index f7d895c8892f..000000000000
--- a/dev-python/typing/typing-3.6.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
-		cd "${S}"/python2 || die
-	else
-		cd "${S}"/src || die
-	fi
-
-	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index c869c3f5f563..d7622a42ab14 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 2ec7c2c97ffe..74d868c8889c 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,2 +1 @@
-DIST qtchooser-0_p20151008.tar.xz 31308 BLAKE2B 47059c8e4059183d2be59ace4c102a68d903d4556999a64ccbfd8b08f4b9ebfa06297987593565a21a7c583b146577bc3ed44ce516537f04fe386ef1424de3c0 SHA512 d6fd56e839b7ce7abbd42300d76d06d67fabb5ca36a6f6a39493b7770599372c4795a90cafeea8cceff8da7ea7f6639d74f76a8241a808364a41905fa3d084c6
 DIST qtchooser-0_p20170803.tar.xz 32012 BLAKE2B a0363ccebfd17c2ad514afbaf7ea80456826a42b88badff3a2ff4259745721f336a1b034f4a51831832f5b2dcd042c7c010c47e0f17b77ecacc5520f0c6f8d53 SHA512 320d898617ad52392fe24834e99ace685dac84e3a7edb1f6e6358baadb6658a51b02ae1af465ef5e081485a002c787c6884b6e1637ffd0406767fe7555fc32a7
diff --git a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
deleted file mode 100644
index 3dab72138124..000000000000
--- a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Qt4/Qt5 version chooser"
-HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
-SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? (
-		dev-qt/qtcore:5
-		dev-qt/qttest:5
-	)"
-RDEPEND="
-	!<dev-qt/assistant-4.8.6:4
-	!<dev-qt/designer-4.8.6:4
-	!<dev-qt/linguist-4.8.6:4
-	!<dev-qt/pixeltool-4.8.6:4
-	!<dev-qt/qdbusviewer-4.8.6:4
-	!<dev-qt/qt3support-4.8.6:4
-	!<dev-qt/qtbearer-4.8.6:4
-	!<dev-qt/qtcore-4.8.6:4
-	!<dev-qt/qtdbus-4.8.6:4
-	!<dev-qt/qtdeclarative-4.8.6:4
-	!<dev-qt/qtdemo-4.8.6:4
-	!<dev-qt/qtgui-4.8.6:4
-	!<dev-qt/qthelp-4.8.6:4
-	!<dev-qt/qtmultimedia-4.8.6:4
-	!<dev-qt/qtopengl-4.8.6:4
-	!<dev-qt/qtopenvg-4.8.6:4
-	!<dev-qt/qtphonon-4.8.6:4
-	!<dev-qt/qtscript-4.8.6:4
-	!<dev-qt/qtsql-4.8.6:4
-	!<dev-qt/qtsvg-4.8.6:4
-	!<dev-qt/qttest-4.8.6:4
-	!<dev-qt/qtwebkit-4.8.6:4
-	!<dev-qt/qtxmlpatterns-4.8.6:4
-"
-
-qtchooser_make() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	qtchooser_make
-}
-
-src_test() {
-	pushd tests/auto >/dev/null || die
-	eqmake5
-	popd >/dev/null || die
-
-	qtchooser_make check
-}
-
-src_install() {
-	qtchooser_make INSTALL_ROOT="${D}" install
-
-	keepdir /etc/xdg/qtchooser
-
-	# TODO: bash and zsh completion
-	# newbashcomp scripts/${PN}.bash ${PN}
-}
diff --git a/dev-qt/qtgui/qtgui-5.11.1.ebuild b/dev-qt/qtgui/qtgui-5.11.1.ebuild
index 034e4220eea8..c8309dc2e2d6 100644
--- a/dev-qt/qtgui/qtgui-5.11.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.1.ebuild
@@ -131,7 +131,7 @@ src_prepare() {
 	qt_use_disable_config dbus dbus \
 		src/platformsupport/themes/genericunix/genericunix.pri
 
-	qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
 
 	qt_use_disable_mod ibus dbus \
 		src/plugins/platforminputcontexts/platforminputcontexts.pro
diff --git a/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
new file mode 100644
index 000000000000..40fde45fdef4
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.11.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:= )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsql/qtsql-5.11.1.ebuild b/dev-qt/qtsql/qtsql-5.11.1.ebuild
deleted file mode 100644
index db29e42db712..000000000000
--- a/dev-qt/qtsql/qtsql-5.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
new file mode 100644
index 000000000000..325786e35c96
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.9.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/libmysqlclient:= )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+	# See also: https://codereview.qt-project.org/#/c/206850/
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
+	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsql/qtsql-5.9.6.ebuild b/dev-qt/qtsql/qtsql-5.9.6.ebuild
deleted file mode 100644
index ae73581446b4..000000000000
--- a/dev-qt/qtsql/qtsql-5.9.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
-	# See also: https://codereview.qt-project.org/#/c/206850/
-)
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index 495c4d06013e..b1eb5634dd54 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-libs/libevent:=
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
-	dev-libs/protobuf:=
 	dev-libs/re2:=
 	media-libs/fontconfig
 	media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
index 4c3fa54cc2cd..2d2d8d590740 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-libs/libevent:=
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
-	dev-libs/protobuf:=
 	dev-libs/re2:=
 	media-libs/fontconfig
 	media-libs/freetype
@@ -62,7 +61,7 @@ RDEPEND="
 	designer? ( ~dev-qt/designer-${PV} )
 	geolocation? ( ~dev-qt/qtpositioning-${PV} )
 	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-ffmpeg? ( <media-video/ffmpeg-4:0= )
 	system-icu? ( dev-libs/icu:= )
 	widgets? (
 		~dev-qt/qtdeclarative-${PV}[widgets]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d19ffea28dff..1edbe9b908f4 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index badb35a379d2..36abb5b6c172 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -2,3 +2,4 @@ DIST activeldap-4.0.6.gem 225280 BLAKE2B 0f03ef95f3d0600d2661eab048c8dda3fbabe51
 DIST activeldap-5.1.1.gem 224768 BLAKE2B cbb54a3e442592ffcd46b99dc92301955e0ec2e6930c7dff0159ddc41166311f9f7b06a0d878dff4180962d6811690fc55e6eef9693048d485672dc83560b63f SHA512 13ae4f05717a9de80f56e19033e694ae1291cf4486dc4c69055892fb2c43469b0dba968949bd668a89d035126d8bde144ad410313dce0d6de80a4ddff884a745
 DIST activeldap-5.2.0.gem 224768 BLAKE2B ae0aa9b2f33121bef3974fdcda5dc06278072241165b5c049fe23bcda8572603dd7695e8839892075ab928e3653c8dd8b6ec87fa17e8c5f9ddb0422b13821676 SHA512 72796a48cb067d61c4f278a3d74f81ebc2c0b1ef648cc02bdf9db0bf9b04a93a924dca3f6134b44c7a9cded7a292984099bd544796b94fb435e21b09d7fc48b3
 DIST activeldap-5.2.1.gem 224768 BLAKE2B 270936f4d8183b6d143f58a662c152a66c0778789c8c7b3e604f2f3aacbdefe0634ed636c35a8cd4fda7cf5b15b5f1fa133e4a6432cf342f42a1e9089daf4a2b SHA512 025f30c545c3f9fd69220557a18f597a4298b06ad5ea67a5f335107aec27a5d5225e7e808b036d245287a642824ba74f583451adfaa585ac2f4f323d737319b9
+DIST activeldap-5.2.2.gem 225280 BLAKE2B a31f77f1e93e5130f6d1a026ea804fca192273ac66c7f04218a5465c79f25934d7a289bcd66e5e7910ef679f9e043f4c22c14607b2f44bc93039e90f3082e798 SHA512 303f26289848b0580a827aa3ea8446ff38dc0604eac7d976f48c7c751c7fe31f918af17a5d530943711dfbf2808e9712ab71ff5cc8c657f78ba60d1c6e3d6072
diff --git a/dev-ruby/activeldap/activeldap-5.2.2.ebuild b/dev-ruby/activeldap/activeldap-5.2.2.ebuild
new file mode 100644
index 000000000000..6f2251813e69
--- /dev/null
+++ b/dev-ruby/activeldap/activeldap-5.2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile TODO doc/text/*"
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="https://github.com/activeldap/activeldap"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Most tests require a live LDAP server to run.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>dev-ruby/activemodel-4.0.0:*
+	dev-ruby/builder
+	dev-ruby/locale
+	dev-ruby/ruby-gettext
+	dev-ruby/gettext_i18n_rails
+	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc doc/text/*
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index a58c2527b120..ce1cb2438589 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,6 +1,5 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
-DIST autoprefixer-rails-8.4.1.gem 200704 BLAKE2B b95f1567fba64f51f35d7a8bb57ca470347ebbae5067244ab50f402f2c596e142b7bd1e90931af4b78a9d3477adbc7b3fbb16ea76d12409f9460b6a6ac58dbf5 SHA512 0e57adf4a52997317d7faacaf409290b441a3806cbebc351c876f08046fca397919f2e1b8a63f58149c2667a48787cb56039cf993803892897f5e74fbc53c840
-DIST autoprefixer-rails-8.5.0.gem 202240 BLAKE2B 881c958c88485e92144d2cd0342b6587b2ec6a96f5a7e6e78c271e07c6071a7544b3acc0d0491fb16094fcedd057878ce9e384599e8301a1b60029e0629e5325 SHA512 19e6737b4d38bac5915bc657de76b4bf2ac593ba754aa6f7f18b3e6e183d21a1a59e0383b071b4767713053258ed2e4214c047199f72cdb92ebb011ba8951092
 DIST autoprefixer-rails-8.6.0.gem 203264 BLAKE2B 23ca172f6c862cb43fa3609ffe1fe02f9d70cd5fdaaa4eece8882aa812327f5a4b8b4b039e898a1800589447463f35832afbceae8c3d59b84c0acf64c897d97d SHA512 7bc5d6991f309aa0f0c6487d5a51fdc30b6ce852f4a3345cc82cdd2b1a6afb19a266cba5c46829cb1defbcc0d88af6b638b8114ab303316bbc844ea75b0181a5
 DIST autoprefixer-rails-8.6.3.gem 208384 BLAKE2B a373a18b43fefafd5e29b9da78b7ec2b276738729b748244d34684429b5081c34516512794234526af7f952218973f20ef6245772436c4cfc4fd511dedd80e92 SHA512 db7bd3737d5356adcd91edfd35623459ba67541ffb615eeb85155de9ec7b2c7bdf69518b9258dbf97a1a8a82a22a27da5eda2e445cbdf305a726f31dbf296f0d
 DIST autoprefixer-rails-8.6.4.gem 208896 BLAKE2B 4a4edba06d55a3de33d625d3827777ad98d7a36b040ec3c2a02274ca50d1e18c68217a81dbf18c61f80310b1f225680971a746e0ac9018eadd4314da1d648da7 SHA512 e71cd9889932e881154737287dca21000b929b8dec56e51fd8a9b97705f0ce83969515aa36e40b78ab4629f404caf78125cd066c7fea19fd63339c2c9b873576
+DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.5.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.5.0.ebuild
deleted file mode 100644
index f623a7c290e0..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="8"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.4.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.5.ebuild
similarity index 100%
rename from dev-ruby/autoprefixer-rails/autoprefixer-rails-8.4.1.ebuild
rename to dev-ruby/autoprefixer-rails/autoprefixer-rails-8.6.5.ebuild
diff --git a/dev-ruby/backports/backports-3.8.0.ebuild b/dev-ruby/backports/backports-3.8.0.ebuild
index bbd00ec13ab2..5d7bf558e3bc 100644
--- a/dev-ruby/backports/backports-3.8.0.ebuild
+++ b/dev-ruby/backports/backports-3.8.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 311e8119db98..e36d1c98ad2b 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1 +1,2 @@
 DIST dnsruby-1.60.2.gem 254976 BLAKE2B fa91e3994331fcb37650c905fb00cd58363ca9b90a3943934b2bb3de0ac82b9efeda418bba45673ec3911676dd1b68bd47d079c3ded201c190d17e2ee2bef0f4 SHA512 dcf191421aaf667f59baaa8098099c5532542e1b9e4fa6ad63a727361d985f14adb3d3fee4aef78c4b6ef8809fe06447ee60d7a220af93e57848a57e0ddfaa22
+DIST dnsruby-1.61.0.gem 257024 BLAKE2B ba0662b758e8950bf4d9617ee1b36330ba5a66560c8a07985dcd7c41be0881287e4b4de35e009c0319021ba7ebde107f67b3bff0eecbac101ebe32fa0d8b3d97 SHA512 7ea06e40790a822d7eaa604d349acb692103b7dd5faa2b9fce8e3a4bba520d9597e1c6e7c5f74ad64cdcdf2583bce606d444c07b4e52d3ef6630fc7869168015
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.0.ebuild
new file mode 100644
index 000000000000..305d820349e9
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.61.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.0.ebuild
index e61be7fd3b8a..b547a2dd3c3e 100644
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.0.ebuild
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/rails:4.2 dev-ruby/activerecord:4.2[sqlite] dev-ruby/temple )"
+ruby_add_bdepend "test? ( dev-ruby/rails:5.2 dev-ruby/activerecord:5.2[sqlite] dev-ruby/temple )"
 ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
 
 all_ruby_prepare() {
@@ -31,5 +31,5 @@ all_ruby_prepare() {
 	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
 
 	# Test against Rails 4.2.0
-	sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die
+	sed -e '1igem "rails", "~>5.2.0"' -i spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 3184d0ecd7c0..c68a87e12486 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,3 +1,3 @@
 DIST parser-2.4.0.2.gem 591360 BLAKE2B 77a832e444e70853fe2aab27c0dfc99536aeafac78e3b4f36d3b1863d5498b656ccf62c55481e9fed763828bd4212b1688f06d77c01cb216653a925081f45cf2 SHA512 6ad62084437556bfa3bdb862bb031646e25ec733ab0e34432580351562a72a71507e454da9fd4f53e590163ea9d666c8076ecb7c92a7f5bf5579ca46cbb28a55
 DIST parser-2.5.1.0.gem 652800 BLAKE2B 56411c34da273d8d02d05eb0dee470cf9afd3ed563d02fc8614cc93cb62f0a1e12cfcd02da95b9ed93acfc69a75ebef2b2b25cd885a69ecac31e3c2b4b37bee5 SHA512 252a20b1b578c4c4b0704001aa7b38ef94e5cc24f3eff34d3afcd661e4f5ce2aa25d2113e42a7d0c8e22583451d3e8067429782be12789cb9465262d7bd1839e
-DIST parser-2.5.1.1.gem 654336 BLAKE2B 2b61457947e4eb76f77b4a0ba1a7960246a4beef6022595de20754cebed74fa684f2cb8c2ba18184324dc7ea58080e85123ed0b88105be8401db13fd8c395f24 SHA512 481a073cc67786c06c7c71ecc51b30ed151e428b9c78dc7991acc6aae6cf70ee0330cb334270f1e3a75128d2a341c8d1c4bec7bf85ee70ce643b4fdb649ec7b2
+DIST parser-2.5.1.2.gem 654336 BLAKE2B bc6960730337d39d60fc63d6da15023c31986230260358bb64b172d06978ec7fd7cd031e1c9db3cf8a04c96c87b034d8043351c3ee4875402ff8fbac7bcc217c SHA512 d7c06cdf77c2efcedd656dc541ca5f4cd80e3c7c16977a87ce29d51515f4d724ec6bdc3367527d14d93b8339e64103b3cb757dbc2f8731b8941aa6ee4ff838d8
diff --git a/dev-ruby/parser/parser-2.5.1.1.ebuild b/dev-ruby/parser/parser-2.5.1.2.ebuild
similarity index 100%
rename from dev-ruby/parser/parser-2.5.1.1.ebuild
rename to dev-ruby/parser/parser-2.5.1.2.ebuild
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index 3b0465a223c1..bc6ead88f213 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1 +1,2 @@
 DIST ruby-ldap-0.9.19.gem 91648 BLAKE2B 0ea6fe17ac2e4cd34a0834c6b95b1db4905e709010962959735cc3cedf9d50695d642b6042711b4f5154198fbe0bb5312903169ba8f1a7868b6f18d681a81682 SHA512 0ed931552df00c11855297ab44fd1c9a79e751937758d38189147f1d37cbce9b1da6fa42e64a9fd44610e948b1c13031013b7931ed473cd55b8425e64a50584a
+DIST ruby-ldap-0.9.20.gem 67072 BLAKE2B 626a35ab764dacfb37c727d867e1d435222730a3e7ea745ee4e7ec051ce3a822cc5a1230b463bc12f4a2390db667ed3b61deceb9842c014f64cdf43a26d285f9 SHA512 4f4902e7eaf4fe0cd421d58c73ce4e625d61ee20ef02363d3cf5754c66237e0f378ac433b234c2b86d5f5284ae03b7ae6c46d3575c512487bc1a931d021c9517
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
new file mode 100644
index 000000000000..c52069c6d7ed
--- /dev/null
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit multilib ruby-fakegem
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
+
+DESCRIPTION="A Ruby interface to some LDAP libraries"
+HOMEPAGE="https://github.com/bearded/ruby-ldap"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+IUSE="ssl"
+DEPEND=">=net-nds/openldap-2
+	dev-libs/cyrus-sasl
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+# Current test set is interactive due to certificate generation and requires
+# running LDAP daemon
+RESTRICT="test"
+
+each_ruby_configure() {
+	local myconf="--with-openldap2"
+	if ! use ssl ; then
+		myconf="${myconf} --without-libcrypto --without-libssl"
+	fi
+	${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
+	sed -i -e 's:-Wl,--no-undefined::' \
+		-e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1
+	cp ldap$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index c1d67ba5bff6..e5202dd34c63 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,2 +1,3 @@
 DIST trollop-1.16.2.gem 22016 BLAKE2B 12d9ad62173bd53e542b4d8c61e7b5fa2116487d2f933b735d73fb101d85555498e497f53d4d6cb145c0970b297f3cfa048ece0e68ee7887ce4b53141993859f SHA512 ad99aa2c0c3b9a8ce7fe0e3f5fc1ab6f600dda5229cb5a15cdf2a3dcc6ffadb8e386a695eebc07b86742c7d62a99794e57e86263a6e03f3bd5f883ad9fe1959e
 DIST trollop-2.1.2.gem 26112 BLAKE2B b8dd1540b7b50a8b587137306df5536a1402457621236a40086ec8e02a48ac0d6aaa1b6f8273ee0814438788f09564bc236031603f9b88bf9705d04cea940053 SHA512 afebe220119476fe3b992f430c79c9de06a6b5398f3ccf957bc0e3b3a1bcebd47a350a94882b3c46aa4db93c70002f3d4adabfe95d0338f14149545c7a9e8dc3
+DIST trollop-2.1.3.gem 30208 BLAKE2B a5fd19679821c55459cf7792f3ec26b8580732e84107f7a3519dcbcf1729ce48567ca2d35346b3e27d3083a3b6cae160ded8c18a118cb04a7a6e60c82bd91e78 SHA512 4d172c6d75f40edb36c353d2e32afce10b012f02927772fa201256126f88c62adce39400225434a80fd678e1cad703e3d3f32cdeddd150287a44ff81a2fca819
diff --git a/dev-ruby/trollop/trollop-2.1.3.ebuild b/dev-ruby/trollop/trollop-2.1.3.ebuild
new file mode 100644
index 000000000000..7c18c245b104
--- /dev/null
+++ b/dev-ruby/trollop/trollop-2.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Trollop is a commandline option parser for Ruby"
+HOMEPAGE="https://manageiq.github.io/trollop/"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/chronic )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundle/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7a4dc0827bd2..8ccb8725cda4 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/Orange/Orange-3.4.5-r2.ebuild b/dev-util/Orange/Orange-3.4.5-r2.ebuild
deleted file mode 100644
index 3e1710650bc0..000000000000
--- a/dev-util/Orange/Orange-3.4.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Open source data visualization and analysis for novice and experts."
-HOMEPAGE="https://orange.biolab.si/"
-SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/anyqt[${PYTHON_USEDEP}]
-	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
-	dev-python/dill[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/keyrings_alt[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
-	dev-python/PyQt5[webkit,svg,${PYTHON_USEDEP}]
-	dev-python/radon[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.11.0[${PYTHON_USEDEP}]
-	>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/orange3-${PV}"
-
-QA_PREBUILT="/usr/lib*/python*/site-packages/Orange/tests/binary-blob.tab"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
new file mode 100644
index 000000000000..a6e1066b6a6a
--- /dev/null
+++ b/dev-util/Orange/Orange-3.4.5-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Open source data visualization and analysis for novice and experts."
+HOMEPAGE="https://orange.biolab.si/"
+SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/anyqt[${PYTHON_USEDEP}]
+	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
+	dev-python/dill[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/keyrings_alt[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
+	dev-python/PyQt5[webkit,svg,${PYTHON_USEDEP}]
+	dev-python/radon[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.11.0[${PYTHON_USEDEP}]
+	>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/orange3-${PV}"
+
+QA_PREBUILT="/usr/lib*/python*/site-packages/Orange/tests/binary-blob.tab"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
index d80226e8b393..078c3dd6b019 100644
--- a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="3.0"
 IUSE="test"
 
diff --git a/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild b/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild
index ff11b505a80f..f3c9451e8d5c 100644
--- a/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="3.1"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
index 7890f7bd1987..c7f9c901c4f6 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="4.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
index 20efb11a7f95..cc906e2cd480 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-5.0.18.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
index 06b14165109d..d7125ec4950d 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 06b14165109d..d7125ec4950d 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
index d4242a208b3b..124d0a51dd93 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
index d4242a208b3b..124d0a51dd93 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index 1b80ebb5bd7e..8f80157a5c95 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="1"
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild
index b23852921af6..4c7db705b892 100644
--- a/dev-util/cucumber/cucumber-3.0.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
index efb1a9e5bd56..6b671bfcda10 100644
--- a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.0.ebuild b/dev-util/cucumber/cucumber-3.1.0.ebuild
index 23e5ff16e71a..181b5b116503 100644
--- a/dev-util/cucumber/cucumber-3.1.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.1.ebuild b/dev-util/cucumber/cucumber-3.1.1.ebuild
index 982b9518dfdf..4235b44e8374 100644
--- a/dev-util/cucumber/cucumber-3.1.1.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 04ad25aec147..66381b837d54 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,3 +1,2 @@
-DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-DIST hadolint-1.7.2.tar.gz 34960 BLAKE2B db1ff9df439e3dbc0e36a47749d0013e76abadfecfb87abfce9e4e41f654a3955bdff2804c92a60e1e399b0e74601c80a7a96012de93bed48e0425afee359e39 SHA512 1562ca9e2b81d6840bd89b98ce706372e32e93505efd6eecef613ddcb089306653da09ef09f8876fe19c6effd1520784ae05c83bb2460975628389ef80f5df93
+DIST hadolint-1.10.2.tar.gz 39009 BLAKE2B 84552ce978d6f53b6e2e769da402585777ce7ef5bd7b66cc538b4f22d73a54b0d07246c1d68b9628f9e2d17d9db2bb472e1902cf017f13344b9277b27658b652 SHA512 2104cb588bdb9620d6a5831ab0f38e6fbd45ab19ba6dbd38e6ced43995f2dd6509d7f9d0180d59a828bbe8de46738f7ff2f3ba9859d9ac4a04b1ba9015071fd9
 DIST hadolint-1.7.4.tar.gz 35187 BLAKE2B e40892f739d7714f62b322d1d3bb6d5cb285e9e6f3bc9c35d21a8d0eef837f32966b6292ce3e20ff461e2775777b2bf6192676ab76d32a558a8242dfe12c697d SHA512 ad92d1f6a1efee2b853613ec078396847e7ee2c525d6069d3cf1708d1af229133eff35e0dee6f0680433a2c6781839beeda02f8cebb52e360c622e6b05ac5925
diff --git a/dev-util/hadolint/hadolint-1.10.2.ebuild b/dev-util/hadolint/hadolint-1.10.2.ebuild
new file mode 100644
index 000000000000..51581f0faaa0
--- /dev/null
+++ b/dev-util/hadolint/hadolint-1.10.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile Linter JavaScript API"
+HOMEPAGE="https://github.com/hadolint/hadolint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.5.0:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/-static//" ${PN}.cabal || die
+}
diff --git a/dev-util/hadolint/hadolint-1.5.0.ebuild b/dev-util/hadolint/hadolint-1.5.0.ebuild
deleted file mode 100644
index c9776ba1bdce..000000000000
--- a/dev-util/hadolint/hadolint-1.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/dlist:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-2.0.0:=[profile?]
-	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.4.7:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hadolint/hadolint-1.7.2.ebuild b/dev-util/hadolint/hadolint-1.7.2.ebuild
deleted file mode 100644
index 7e0e70f87627..000000000000
--- a/dev-util/hadolint/hadolint-1.7.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.5.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild b/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
index 9b76b868f237..95d38ce604dd 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND=""
-DEPEND="dev-util/spirv-headers"
+DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710"
 EGIT_COMMIT="f508896d6487d09f5c9a2a3835595446fec0791a"
 S="${WORKDIR}/SPIRV-Tools-${PV}"
 
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 31b356a6c96c..029556876e65 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 RESTRICT="test"
 
 RDEPEND=""
-DEPEND="dev-util/spirv-headers"
+DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index a43491141527..ac9ba15d3772 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index aaea1ee4b89f..784e304a962d 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -94,10 +94,10 @@ IUSE=""
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
 if [[ -n ${BASEPOL} ]] && [[ "${BASEPOL}" != "9999" ]]; then
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 		https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
 elif [[ "${BASEPOL}" != "9999" ]]; then
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2"
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2"
 else
 	SRC_URI=""
 fi
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index ff197f94204e..e802685c2e05 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 5b267c021694..2ce76da3418d 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -1,3 +1,5 @@
 DIST emutos-256k-0.9.4.zip 1600186 BLAKE2B 2c5243165d651a8f4f3b56d0b4bf30bbfd183e4c9d3ae2b1087c3864d540efe445cf10b68e98e862a12be9f34c388548959376a665aac91f09e05b4b39abce58 SHA512 ce7ce9e53c82f7861752ee454a4e3ce616bca73ce580e2b803deea22497de06e5ab49a69af6507ce98ab337312dbb879d258ba2acdf868443f406761caa69404
+DIST emutos-256k-0.9.9.1.zip 1913841 BLAKE2B 3f6093b5df9f694c8f75c07378bbb2e6326b4cf5235fd76059d6cd49701744e16b6fcbf8a92ece7d7bc67c480578f6245bd2e5d48a3e73240b7ae57f0c9ad4d6 SHA512 9ede677a53414bf86b111b3703386aea2b9600abbd6a4fd632b3549faa50f7308fcc7a0eb78626d59a4f2c7d8b844dc2ad5137d2b927f070ab1482799605a56d
 DIST emutos-512k-0.9.4.zip 314877 BLAKE2B 69388ce090c56c05861b859061a9b47998354dc240a0b482f616c5a2c9440ee897abdad96b946f922f77f60ee7d781e37538a42bfc778a6e15ab82225596d91b SHA512 00c8718f364712f5d346859dc40ed83c1792521c9600520aacf199f7d6b24d5cf7a3e2533e1e343d6aa9e77ed3056f8636713bb7c3e9739254e0658c921a78a8
+DIST emutos-512k-0.9.9.1.zip 273400 BLAKE2B baf7001b1150aa5aa5482920733c613c8ebc2d9eeb944de6c1cae471e6889062ed935a3bfe17d209a54733dd5ca453244fde6d906b7dd7f68772633d456df594 SHA512 38f5084df230883634715a1bd1ec542ed63027fae5690a7857986653a918f302126a288600aefa38bd12920d40c1a535cd467b66d55a1b0471364a590ca7986a
 DIST emutos-src-0.9.3.tar.gz 935570 BLAKE2B bcbf216e8bfbae681a404fdaa07e7bc00e1a865e4f6430bf70741ea9a92ee16ab90eef99140c29f3cf381bac93d72e20312e7f21b2e96bc23144c73af0b9191f SHA512 45e19a9f8ebbd1675059a78d1416d0571bc54c3979b36c684f2394f508f48f6f1dae10f4eb966e1757ff10698644302c788ee3e51bf42fe10d131d87508d9824
diff --git a/games-emulation/emutos/emutos-0.9.9.1.ebuild b/games-emulation/emutos/emutos-0.9.9.1.ebuild
new file mode 100644
index 000000000000..10bd4656d74a
--- /dev/null
+++ b/games-emulation/emutos/emutos-0.9.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
+HOMEPAGE="http://emutos.sourceforge.net"
+SRC_URI="mirror://sourceforge/emutos/${PN}-512k-${PV}.zip
+	mirror://sourceforge/emutos/${PN}-256k-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins */*.img
+	dodoc ${PN}-512k-${PV}/{readme,doc/{announce,authors,changelog,status}}.txt
+}
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index f6267b9ecdeb..e061a3037e68 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1 +1 @@
-DIST hatari-1.8.0.tar.bz2 1985358 BLAKE2B 12fc000dd04c0f0dcead0b6713837a0d4c02df5ecdab9c2d4d2d91bd4cf6f8657acf2d97649a5704b646fae4fefe0626300e297b9e8698e7b8b72854d37b7097 SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0
+DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753
diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch
deleted file mode 100644
index 715fb189143f..000000000000
--- a/games-emulation/hatari/files/hatari-1.8.0-gentoo-docdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- hatari-1.6.1/python-ui/uihelpers.py
-+++ hatari-1.6.1/python-ui/uihelpers.py
-@@ -97,9 +97,7 @@
-         # first try whether there are local Hatari docs in standard place
-         # for this Hatari/UI version
-         sep = os.sep
--        path = self.get_binary_path("hatari")
--        path = sep.join(path.split(sep)[:-2]) # remove "bin/hatari"
--        path = path + sep + "share" + sep + "doc" + sep + "hatari" + sep
-+        path = "@DOCDIR@"
-         if os.path.exists(path + "manual.html"):
-             return path
-         # if not, point to latest Hatari HG version docs
diff --git a/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch
deleted file mode 100644
index 4f10d6d9e3ce..000000000000
--- a/games-emulation/hatari/files/hatari-1.8.0-gentoo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- hatari-1.4.0.orig/src/paths.c
-+++ hatari-1.4.0/src/paths.c
-@@ -109,71 +109,6 @@
- 	free(pTmpName);
- }
- 
--
--/**
-- * Locate the directory where the hatari executable resides
-- */
--static char *Paths_InitExecDir(const char *argv0)
--{
--	char *psExecDir;  /* Path string where the hatari executable can be found */
--
--	/* Allocate memory for storing the path string of the executable */
--	psExecDir = malloc(FILENAME_MAX);
--	if (!psExecDir)
--	{
--		fprintf(stderr, "Out of memory (Paths_Init)\n");
--		exit(-1);
--	}
--
--	/* Determine the bindir...
--	 * Start with empty string, then try to use OS specific functions,
--	 * and finally analyze the PATH variable if it has not been found yet. */
--	psExecDir[0] = '\0';
--
--#if defined(__linux__)
--	{
--		int i;
--		/* On Linux, we can analyze the symlink /proc/self/exe */
--		i = readlink("/proc/self/exe", psExecDir, FILENAME_MAX);
--		if (i > 0)
--		{
--			char *p;
--			psExecDir[i] = '\0';
--			p = strrchr(psExecDir, '/');    /* Search last slash */
--			if (p)
--				*p = 0;                     /* Strip file name from path */
--		}
--	}
--//#elif defined(WIN32) || defined(__CEGCC__)
--//	/* On Windows we can use GetModuleFileName for getting the exe path */
--//	GetModuleFileName(NULL, psExecDir, FILENAME_MAX);
--#endif
--
--	/* If we do not have the execdir yet, analyze argv[0] and the PATH: */
--	if (psExecDir[0] == 0)
--	{
--		if (strchr(argv0, PATHSEP) == 0)
--		{
--			/* No separator in argv[0], we have to explore PATH... */
--			Paths_GetExecDirFromPATH(argv0, psExecDir, FILENAME_MAX);
--		}
--		else
--		{
--			/* There was a path separator in argv[0], so let's assume a
--			 * relative or absolute path to the current directory in argv[0] */
--			char *p;
--			strncpy(psExecDir, argv0, FILENAME_MAX);
--			psExecDir[FILENAME_MAX-1] = 0;
--			p = strrchr(psExecDir, PATHSEP);  /* Search last slash */
--			if (p)
--				*p = 0;                       /* Strip file name from path */
--		}
--	}
--
--	return psExecDir;
--}
--
--
- /**
-  * Initialize the users home directory string
-  * and Hatari's home directory (~/.hatari)
-@@ -226,8 +161,6 @@
-  */
- void Paths_Init(const char *argv0)
- {
--	char *psExecDir;  /* Path string where the hatari executable can be found */
--
- 	/* Init working directory string */
- 	if (getcwd(sWorkingDir, FILENAME_MAX) == NULL)
- 	{
-@@ -238,27 +171,11 @@
- 	/* Init the user's home directory string */
- 	Paths_InitHomeDirs();
- 
--	/* Get the directory where the executable resides */
--	psExecDir = Paths_InitExecDir(argv0);
--
--	/* Now create the datadir path name from the bindir path name: */
--	if (psExecDir && strlen(psExecDir) > 0)
--	{
--		snprintf(sDataDir, sizeof(sDataDir), "%s%c%s",
--		         psExecDir, PATHSEP, BIN2DATADIR);
--	}
--	else
--	{
--		/* bindir could not be determined, let's assume datadir is relative
--		 * to current working directory... */
--		strcpy(sDataDir, BIN2DATADIR);
--	}
-+	strcpy(sDataDir, BIN2DATADIR);
- 
- 	/* And finally make a proper absolute path out of datadir: */
- 	File_MakeAbsoluteName(sDataDir);
- 
--	free(psExecDir);
--
- 	/* fprintf(stderr, " WorkingDir = %s\n DataDir = %s\n UserHomeDir = %s\n HatariHomeDir = %s\n",
- 	        sWorkingDir, sDataDir, sUserHomeDir, sHatariHomeDir); */
- }
diff --git a/games-emulation/hatari/hatari-1.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild
deleted file mode 100644
index 0ec9601e1835..000000000000
--- a/games-emulation/hatari/hatari-1.8.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs cmake-utils python-single-r1 games
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/libsdl[X,sound,video]
-	sys-libs/readline:0
-	media-libs/libpng:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	games-emulation/emutos"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-gentoo-docdir.patch
-)
-
-pkg_setup() {
-	games_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# build with newer zlib (bug #387829)
-	sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die
-	sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
-	sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
-	sed -i \
-		-e "s%conf=.*$%conf=\"${GAMES_SYSCONFDIR}\"%" \
-		-e "s%path=.*$%path=\"${GAMES_DATADIR}/${PN}/hatariui\"%" \
-		python-ui/hatariui || die
-	sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
-	rm -f doc/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DCMAKE_BUILD_TYPE:STRING=Release"
-		"-DDATADIR=${GAMES_DATADIR}/${PN}"
-		"-DBIN2DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DMANDIR=/usr/share/man/man1"
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	DOCS="readme.txt doc/*.txt" cmake-utils_src_install
-	dohtml -r doc/
-	python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,"
-	elog "has been installed in $(games_get_libdir) with a .img extension (there"
-	elog "are several from which to choose)."
-	elog
-	elog "Another option is to go to http://www.atari.st/ and get a real TOS:"
-	elog "  http://www.atari.st/"
-	elog
-	elog "The first time you run hatari, you should configure it to find the"
-	elog "TOS you prefer to use.  Be sure to save your settings."
-	echo
-}
diff --git a/games-emulation/hatari/hatari-2.1.0.ebuild b/games-emulation/hatari/hatari-2.1.0.ebuild
new file mode 100644
index 000000000000..92eba857519e
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit toolchain-funcs cmake-utils python-single-r1
+
+DESCRIPTION="Atari ST emulator"
+HOMEPAGE="http://hatari.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sdl2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	games-emulation/caps
+	sdl2? ( media-libs/libsdl2[X,sound,video] )
+	!sdl2? ( media-libs/libsdl[X,sound,video] )
+	media-libs/portaudio
+	media-libs/portmidi
+	sys-libs/readline:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	>=games-emulation/emutos-0.9.9.1"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,
+has been installed in /usr/lib*/hatari with a .img extension (there
+are several from which to choose).
+Another option is to go to http://www.atari.st/ and get a real TOS:
+http://www.atari.st/
+The first time you run hatari, you should configure it to find the
+TOS you prefer to use.  Be sure to save your settings.
+"
+
+DOCS="readme.txt doc/*.txt"
+HTML_DOCS="doc/"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
+	sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
+	sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		"-DDOCDIR=/usr/share/doc/${PF}"
+		"-DENABLE_SDL2=$(usex sdl2)"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
index 78274e0fa550..d4511e749d48 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<use>
+	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
+</use>
 </pkgmetadata>
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 22ae4eb13670..9e9b81a2bf02 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
new file mode 100644
index 000000000000..82e11b237828
--- /dev/null
+++ b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
+# interpreters are licensed under GPLv2, BSD or MIT license, except:
+#   - glulxe: custom license, see "terps/glulxle/README"
+#   - hugo: custom license, see "licenses/HUGO License.txt"
+# Since we don't compile or install any of the bundled fonts, their licenses
+# don't apply. (Fonts are installed through dependencies instead.)
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs
+
+DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
+HOMEPAGE="http://ccxvii.net/gargoyle/"
+SRC_URI="https://garglk.googlecode.com/files/${P}-sources.zip"
+
+LICENSE="BSD GPL-2 MIT Hugo Glulxe"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/sdl-mixer
+	media-libs/sdl-sound[modplug,mp3,vorbis]
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/ftjam
+	virtual/pkgconfig"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Substitute custom CFLAGS/LDFLAGS.
+	sed -i -e \
+		"/^\s*OPTIM = / {
+			s/ \(-O.*\)\? ;/ ;/
+			a LINKFLAGS = ${LDFLAGS} ;
+			a SHRLINKFLAGS = ${LDFLAGS} ;
+		}" Jamrules || die
+
+	# Don't link against libraries used indirectly through SDL_sound.
+	sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die
+
+	# Convert garglk.ini to UNIX format.
+	edos2unix garglk/garglk.ini
+
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
+	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
+	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
+	default
+}
+
+src_compile() {
+	# build system messes up flags and toolchain completely
+	# append flags to compiler commands to have consistent behavior
+	jam \
+		-sAR="$(tc-getAR) cru" \
+		-sCC="$(tc-getCC) ${CFLAGS}" \
+		-sCCFLAGS="" \
+		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
+		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
+		-sC++FLAGS="" \
+		-sGARGLKINI="/etc/garglk.ini" \
+		-sUSESDL=yes \
+		-sBUNDLEFONTS=no \
+		-dx \
+		-j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	_BINDIR="/usr/libexec/${PN}" \
+	_APPDIR="/usr/libexec/${PN}" \
+	_LIBDIR="/usr/$(get_libdir)" \
+	EXEMODE=755 \
+	FILEMODE=755 \
+	jam install || die
+
+	# Install config file.
+	insinto "/etc"
+	newins garglk/garglk.ini garglk.ini
+
+	# Install application entry and icon.
+	domenu garglk/${PN}.desktop
+	doicon -s 32 garglk/${PN}-house.png
+
+	# Symlink binaries to avoid name clashes.
+	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
+		level9 magnetic nitfol scare tadsr
+	do
+		dosym "../libexec/${PN}/${terp}" \
+			"/usr/bin/${PN}-${terp}"
+	done
+
+	# Also symlink the main binary since it resides in libexec.
+	dosym "../libexec/${PN}/${PN}" \
+		"/usr/bin/${PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild
deleted file mode 100644
index 640adac5fa7e..000000000000
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
-# interpreters are licensed under GPLv2, BSD or MIT license, except:
-#   - glulxe: custom license, see "terps/glulxle/README"
-#   - hugo: custom license, see "licenses/HUGO License.txt"
-# Since we don't compile or install any of the bundled fonts, their licenses
-# don't apply. (Fonts are installed through dependencies instead.)
-
-EAPI=5
-inherit eutils flag-o-matic multiprocessing toolchain-funcs gnome2-utils games
-
-DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
-HOMEPAGE="http://ccxvii.net/gargoyle/"
-SRC_URI="https://garglk.googlecode.com/files/${P}-sources.zip"
-
-LICENSE="BSD GPL-2 MIT Hugo Glulxe"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-fonts/libertine-5
-	media-fonts/liberation-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/sdl-mixer
-	media-libs/sdl-sound[modplug,mp3,vorbis]
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Substitute custom CFLAGS/LDFLAGS.
-	sed -i -e \
-		"/^\s*OPTIM = / {
-			s/ \(-O.*\)\? ;/ ;/
-			a LINKFLAGS = ${LDFLAGS} ;
-			a SHRLINKFLAGS = ${LDFLAGS} ;
-		}" Jamrules || die
-
-	# Don't link against libraries used indirectly through SDL_sound.
-	sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die
-
-	# Convert garglk.ini to UNIX format.
-	edos2unix garglk/garglk.ini
-
-	# The font name of Linux Libertine changed in version 5.
-	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die
-
-	epatch "${FILESDIR}"/${P}-desktopfile.patch
-	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
-}
-
-src_compile() {
-	# build system messes up flags and toolchain completely
-	# append flags to compiler commands to have consistent behavior
-	jam \
-		-sAR="$(tc-getAR) cru" \
-		-sCC="$(tc-getCC) ${CFLAGS}" \
-		-sCCFLAGS="" \
-		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
-		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
-		-sC++FLAGS="" \
-		-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
-		-sUSESDL=yes \
-		-sBUNDLEFONTS=no \
-		-dx \
-		-j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	_BINDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_APPDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_LIBDIR="$(games_get_libdir)" \
-	EXEMODE=755 \
-	FILEMODE=755 \
-	jam install || die
-
-	# Install config file.
-	insinto "${GAMES_SYSCONFDIR}"
-	newins garglk/garglk.ini garglk.ini
-
-	# Install application entry and icon.
-	domenu garglk/${PN}.desktop
-	doicon -s 32 garglk/${PN}-house.png
-
-	# Symlink binaries to avoid name clashes.
-	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
-		level9 magnetic nitfol scare tadsr
-	do
-		dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \
-			"${GAMES_BINDIR}/${PN}-${terp}"
-	done
-
-	# Also symlink the main binary since it resides in libexec.
-	dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \
-		"${GAMES_BINDIR}/${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index df497a40fa54..70152330bbe3 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 4818dcdf6c99..082aaf0c4609 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-17.12.3.tar.xz 284008 BLAKE2B e88d748d5640fd5906b3f4d843d50da59841f9e3dd6f15ce19e9bca32112597300d85e257ba77ca47b6c4a556a14fd2177c6ea7ef3e8cacc0ae6b9b8d8af9791 SHA512 456f67e88961c1187d5a347f2651665848468b3179dce91bcdef2dbbcca7fdb7d760bdf25f8dd8de9b41ea2794a069385c1cfbac407b6e187b0c6f3e460638d4
-DIST akonadi-calendar-18.04.2.tar.xz 335948 BLAKE2B 30d15d718632c44f646cfbfa07d620fd33cfacdbcd6dce1c91cd765d556586d570a0be813417c7bf486f1a85ff15ae348031c33ff39e8e8d2365d4ba8b8afa76 SHA512 b6f6b8d8c2e40e6654ebc6054d795eed40916e9b8c6a7d0bf07bf7840f61650f00ce6b79320368f540c4d87d48fc132d7fdbc8c31cc46f87992ad5f0902f1687
+DIST akonadi-calendar-18.04.3.tar.xz 335956 BLAKE2B bc7e59e3065b7e7550aa88d0e0210861cb599a393bfedbc7121a4db93e8c7e1585f82d6542f9b21bbaf61021fc696bd045ddf834efa746db936e93ee36f9a0c1 SHA512 f062222a7accf95611296830ffbc0cb1a6ac1fa48e5eddbb9bcb6b9d8a5969e393308da25ac9a636cc79baf454ee75670713720fce1c5c270d7c1c3ca3e3f26e
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi-calendar/akonadi-calendar-18.04.2.ebuild
rename to kde-apps/akonadi-calendar/akonadi-calendar-18.04.3.ebuild
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index b05f48f87ed1..48d0630ad353 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-contacts-17.12.3.tar.xz 345296 BLAKE2B 2f249c14dd8ea549eb1a8aa8c5508dfb9ba43f4521e979b3ff9a76d50a5337a7df6a7d4ef18cfe821659c45bd7f7c691ef301c32dadca93c9cfcf06eca9b85e1 SHA512 37e621015ebbc80d765e4668cd720901b815c55b84f78ff39c163ec90dafdd50ef46567c6091afa02d434d339d4b172e5332d8954a134a50215a12bb099822bb
-DIST akonadi-contacts-18.04.2.tar.xz 392336 BLAKE2B 94054be2b04421be0384420e1b46efc46d40b194214b39c3124e731962bbc560f3e8c11ecd21cc32757316f1aa7b5a8e7877be1c4516490bd6ecb9fc86f784f9 SHA512 70413177bebfab1285b35bf9f59dffb732b617cb9a3b0895312ae1af05a552b8416ef785a642be1090f5e76027afa5500df588a7b97e610082d79cf862eb05c9
+DIST akonadi-contacts-18.04.3.tar.xz 392228 BLAKE2B e56204b67cc0918be38c543aee83cb1a239698d3a2e06e3ea1615456029210d8ac06481a0317158b07a0e801babbf68a5b539592ffb10a05779159656cc5e252 SHA512 3334bad8cf9ee9b79253260ec62cab527d8fe823131fdb212f1e2dcc120892715c24aaf0a5d977939a69d47e458034b405e8be4da27a12022b94488332ae7683
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi-contacts/akonadi-contacts-18.04.2.ebuild
rename to kde-apps/akonadi-contacts/akonadi-contacts-18.04.3.ebuild
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 0c75bb56790c..6abf572b4c18 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-import-wizard-17.12.3.tar.xz 436656 BLAKE2B 149488e7c5188df4edd78d9d3d58565b5eb629f25cb7a2e759ee8f6fb6e1112948cbc7e953778ca744616739b3ad86f4707c1680e87e1509c35aab64fb46f5e2 SHA512 3c3001803921c2860bf1c16c73db5cffadd5ae1b77f0577d1bd0eb05e19b4632657ea4524088698e770b9843cda69faee9071c8a4269de158d65ed730b8fa074
-DIST akonadi-import-wizard-18.04.2.tar.xz 436648 BLAKE2B b61dd2f0d41e6f0102538a15f7ab37a1af7855d460bf0aaf640b6d5729799365faf3502d9ddd0135146d0c7c89c793bd4058fa57d849157ec09a8a74e9114547 SHA512 1a7f0f2f35cd153920e381a45bfcea7fcab3296185ddc2bfce967296d59659e2e5e99e7f8c5fc3c698b081b1a50cdf7fd684926fa9d057b0cb6fa384d836314b
+DIST akonadi-import-wizard-18.04.3.tar.xz 436604 BLAKE2B e490232039c094272152b91e4158a70bc4a999de933ee6f76d85dfdea0eda9f7f011e394f050178b398ce1c5c47378cff0415b0f1ccc1a7b93fb03476161a545 SHA512 ca43762f84f2a8df30818ceec0225c105366a68e4d9c0407897c6d4974ff4e1ea40989a500d7c174f4ce94076766d78784dd11a6c60567998237b1477b9e0750
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.2.ebuild
rename to kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.3.ebuild
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 7bd970a0aeb2..f6035a773eb2 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-mime-17.12.3.tar.xz 129916 BLAKE2B d0aafdbb9b2ba2e39dd33a6e8f5e7638b840c4b7a67731ac87c1c33d986a240b38fe18e467c0987f54b8aea51b42c7078b3eda588a349cbc439031dfbc8b4cb1 SHA512 5f260b00ddb5949cb924e62b1781ef4d6d3b23fca310ef120440345f6095ab678a41672287b139c8e0ac7c3d5a7dc0aaa15cfe9d59ecf75b51b1c09de7d952b7
-DIST akonadi-mime-18.04.2.tar.xz 137372 BLAKE2B d36bc1e9bcfdc985cca493b827bd52aa3a75f7126d89867489b5322977838852f189d80e86d2d4238ad6f4260429d6af1c2a979ac479cad4231fe253701f47c4 SHA512 9f328044442b93cff8c16e82c787de287009a71080fcc092c52117c413bb77e687d7adbf73dac3f1dc04784b0dcb90840c3c7c55e2ea541398bb891f60417524
+DIST akonadi-mime-18.04.3.tar.xz 137320 BLAKE2B b25bbd2e20028924b3cbd1a0ca6196ca34c8edc224cb14b431b58f4a3091423398abcb290bad7206dd929120b6e792eb1d33ae1c1326e05999d220130e55fea6 SHA512 85160394bbf9e6d922148ae3adc9cec1d0204a826b05db3c291e81d076cb08a1c14aed1e7ef031da9e0bbf043524f4d314b7f5f23639717b41911cdc2f1c5de2
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.04.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi-mime/akonadi-mime-18.04.2.ebuild
rename to kde-apps/akonadi-mime/akonadi-mime-18.04.3.ebuild
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index f8febe448cdf..6c5269fe41ad 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-notes-17.12.3.tar.xz 24520 BLAKE2B c37debede8bcbf97a6f2bee6d7195ddda69f466034b6ba60299bf93485dee1826930a7d029ebc39df7e6317c9124db57a8b7d97a6713635f4fd266dbc1dcc93b SHA512 306fafd7ef59f541cc30b111f4ab83cc2d218c8949ed14805f8116388a328ec8d522194408afbf455d133ef8a40153c04b9dbf907e4b0e784458f9fe2aaaae62
-DIST akonadi-notes-18.04.2.tar.xz 24676 BLAKE2B d220d2fb276f1bb97606c62c646fa0d15d5a72ef69c602683505e0a5fa954b04972b663da82b9b18840460a6e87f136d9e199ee08f3830d4863f99e95b44cba7 SHA512 fd6277863f87e0d798768cbb4b8d615eb1d38b5f9fc86111416c8e42ff9121998d5ed3c7d056e87364fdc6c038d84e632ccd1efa0ed1fcde4ec93e79cf534dc4
+DIST akonadi-notes-18.04.3.tar.xz 24600 BLAKE2B 4a711c483814e1fc7a7f9931305f472854223e93b931437079c1c11b277d7ac0543827a7403b5bb7c2d10f79e635c5364d24e1a701e0465914b6eb00ebed878a SHA512 0aecf012ae8bc03ffc2ba5ba68893486d4ea91cc2d6efecccc3fc60b7f03a51596475285e0fa2e1b9b025b3b046cdca4f4d248e8aa00fb08c0176269ca067177
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.04.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi-notes/akonadi-notes-18.04.2.ebuild
rename to kde-apps/akonadi-notes/akonadi-notes-18.04.3.ebuild
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index c643734cdd8e..e39e27a90561 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-search-17.12.3.tar.xz 81872 BLAKE2B bcbc5cd5d2cf37bb80c890164c45f0141d7d668c59ad099888831efb45781d15d8d34ffac2c18a9dde4fc697cf02dfe0493d01c60bc687b137dcd6cbdb11f6da SHA512 3c227f25784069bca95abe43657fa2964049dac840629f6ceeb8ea7378f4a8860b4dc2346a7cf1069d9cd0950ceaa65c1aad772199a4e15b27d099ca16c46689
-DIST akonadi-search-18.04.2.tar.xz 82516 BLAKE2B 45d336755fbc5141d63e8866c96155f693684aceb6ae5a837e47647a3295cff20c8f51df32235b4d190357754ff6c01958c04dbaaf585791bada01ab3cbbfcd8 SHA512 ea406c095233c037628f3078bfab30bf8139e1e33e428137288cc57f42d7b5175c40176830e11b0b21f9e5793436de8e5922537523a7b00fd07e9c0aa2a01d0c
+DIST akonadi-search-18.04.3.tar.xz 82440 BLAKE2B 9bd8fb4a8c0e319d8606741efcda247fa4b4bc3c647ecd5dfb2746739bb954e3e2ca68394464fb7c696722eaf5aceeae21e3c68c322c870a1b8af1fd1cc1dcc9 SHA512 5b353542f6e32b9a71ddecf36a358a7e261626e8f58e011d40cdde71afdc7c03abfed5e1b2c047eb7f01a57744b7d2be0af8cf53398f4fabb31413224cb2946e
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.2.ebuild b/kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi-search/akonadi-search-18.04.2.ebuild
rename to kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 95efb5643053..25ce68717365 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-17.12.3.tar.xz 1521576 BLAKE2B d4809ccac14a18d922f04bf772892aaf7f43209b030880ec72d7ded662a1dd03bd768d71a30c1655a1634ad7b20f3c24c176d4da9a5beb1e9c543c256dbb4b97 SHA512 410b72dfa6eb3272bb8b959f7e0ba5951faef598e7c73696844bb6e33d4f5edb0bed4dc5ccea68111a7eef3c9f7a776acf8823c9a138b6af28d819ce8077595f
-DIST akonadi-18.04.2.tar.xz 1525976 BLAKE2B 3fa556a67353069b681a6e70492778bae9ea8bc6623ecfc5ea044cf2696d962ffec80f010246eadb16a3fe3dd0f5a8a94f8b4fda53ab08c5ac98b8c11a614da7 SHA512 ea110585fe431f65915862045cf3cd72e4dd8a3ca47c36f62df9ec3967ce4ff48911342c4055faa8b00ff370ed9411150d735b0792d0c3fe9321146d877ef002
+DIST akonadi-18.04.3.tar.xz 1526416 BLAKE2B 094195355ee2906e85211bedbeb99eb4064b41a37c43d231ddec4e7295182d73fb5da6142fb123484108de0eddd79fb66c2439326cf0e1c0ea52be7a5c6d6173 SHA512 dc4111d2198c5ac8a11613c60e4cc330b1d337179c917354a059c3f843b218e5c465bb44ae924a9db712f985d0d044625a56634481faa474a0e92888d098e49c
diff --git a/kde-apps/akonadi/akonadi-18.04.2.ebuild b/kde-apps/akonadi/akonadi-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadi/akonadi-18.04.2.ebuild
rename to kde-apps/akonadi/akonadi-18.04.3.ebuild
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 55a579b44e8e..f0ccd8dfe27b 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1,2 @@
 DIST akonadiconsole-17.12.3.tar.xz 185432 BLAKE2B c4be134ccf31a42f9244d7ad0b717e4cd8e7c89d1208e70339f096b84c64fc22223de318fb4d3e843ed7bf2c0d61ceeed4e4dc10db964c581b537ef9d7f7d0b3 SHA512 f491a16fb93a23cbad1160d5bf63ffe07ee015097211e23464031060247b550399140626f016d2a5336ed783a55f8d803a7aea6c8f4cac9495fcde35b082765a
-DIST akonadiconsole-18.04.2.tar.xz 185772 BLAKE2B c35f5b574a96b26356ae242761f61d9cbd093672a29c962b2a2962356a930310d6d5c12840cb78f0d3e1d3bda97b359e62d3d87eb4fe5271a44091bf14def6db SHA512 6a89c0183093ffcfaf88b0cfd2c49a65f9b0b844cd3c0e01eba3a11948825a652dc66a044ea2ebe0fc886a45a2fd5d7fdcd258bce8e6f4a7034cd744ce418c43
+DIST akonadiconsole-18.04.3.tar.xz 185792 BLAKE2B 7d9a5132a9ada0ff6dd8816e81b26aa21f72ec0a133d64f9d26dd4fe208bf2363477a9cf4c970ac714077c9cbfcbc46a4af6905b854cd5a7edc23d5353738848 SHA512 c413dfc858a6aa496e5533f1f46dc021c9c5e14582924dbc20a696da01035f2d237f30770a238cc33c4e91def9c1a18274e699185fb5bd6fae881c203687c2a4
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.04.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akonadiconsole/akonadiconsole-18.04.2.ebuild
rename to kde-apps/akonadiconsole/akonadiconsole-18.04.3.ebuild
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 1bc852d633cb..b7694f2600aa 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1,2 @@
 DIST akregator-17.12.3.tar.xz 2251784 BLAKE2B b5adb96501b6226817b6aa29a55f47f34d0dc85bacf68d4b971e9c2688a12c9f5ba24b274a5f154ceb2549a3558359cf97fbff176a2af9ac2abb4e6abdee5f89 SHA512 dc047fdedfba0f45b9822378352ae57e8b1ddef6712e669868be65f6820da46ec601483e1ff6b509b84fde236faea2a8fb4317bfd88cbd641e2d7af034a8452b
-DIST akregator-18.04.2.tar.xz 2251116 BLAKE2B 396f56f1c71e2379db2f03066292676fb5529dd92bc11a85b660303c546d56b8d240323bc919acec45702203777b8649b83f9dafee8d55fe0c04e47f74835dea SHA512 413281fedcb21e2f273a709405d0ba411d4c2d1d2fa3e54173a83bdfb3c33892d7e4a1260032cd0d356c9f5e05e46ecdc93785a9497eba3f678549d02ee027d2
+DIST akregator-18.04.3.tar.xz 2251168 BLAKE2B 9c57a3e125e5bf191df4fc60b9eacb471942735f5f2890a74f8812a97bbaacdbbf537b070d58f73ca054dee6eb42a575168c3061717c0809e79316b74f80fc2d SHA512 d9f1385c1105be62a7c209510e66b8152ddf3928a55210bff82c679602ef630486f9b7cbbc36d4d28183b7f7667049a5b474d953af38aed0bbbe3c7b00732930
diff --git a/kde-apps/akregator/akregator-18.04.2.ebuild b/kde-apps/akregator/akregator-18.04.3.ebuild
similarity index 100%
rename from kde-apps/akregator/akregator-18.04.2.ebuild
rename to kde-apps/akregator/akregator-18.04.3.ebuild
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 73e5d2164071..aaac84a99069 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,2 +1,2 @@
 DIST analitza-17.12.3.tar.xz 331052 BLAKE2B e250093623dd516051684473fdb03becaed6c3361bc478f633276a16cf5f75f6c6a8e2df5cb98b8a998e570f4619f2a0c32a59170fbad2563ac93e00e29991f7 SHA512 31d461e09736b4109b6d0af37e4ff1af075963566b0363b7801849bea83b411a53a8498d6c7b55778636e7bd22c120e46dd99dfa74d841532269044449f7621b
-DIST analitza-18.04.2.tar.xz 331656 BLAKE2B ff6e2b3bc4fcc072d8f42c7baf8d3400a1bf338515663544494bc64531e8105c5e668c632b4c2d7bc173ec5b474e42a52aaac1c39a2c57c8e09f6516f2dbdc4d SHA512 7c25af38e250e0edaefa85870c6bcb0c3c6e7173eed92d172d121edf94eb9a131ef1d7d9a98b40931592ae9bfad1fb97e730e48ab57d98009ac9661647f4801b
+DIST analitza-18.04.3.tar.xz 331744 BLAKE2B 41f2716cc8b4affb63ef38abccf51f46141588d27dd4a4980f185b02003489fa239ac659d5c030640796473e3adbd37f9579575684dc36ff8b3214fda0252bf7 SHA512 1eabdba287830723ad6d6c30299c6bebe902a5d0236c70c0435a9abb83442604010fdea064e91a023e7fc8a85e32c6ffc83dc9ae31d287cc71a828cd77dd83e9
diff --git a/kde-apps/analitza/analitza-18.04.2.ebuild b/kde-apps/analitza/analitza-18.04.3.ebuild
similarity index 100%
rename from kde-apps/analitza/analitza-18.04.2.ebuild
rename to kde-apps/analitza/analitza-18.04.3.ebuild
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index b9268d419c27..224de7b4eabe 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,2 +1,2 @@
 DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
-DIST ark-18.04.2.tar.xz 1973540 BLAKE2B 64bb00807ec0fa0511448bfb6d4e35bae3034b00058806b82a93c753f6dcfa61b75cd5601c42bfccbec3507003864f4543bc87c98cb66a303bc6f192d3d7a96f SHA512 bf3b26ec61a39585505a6e0818dc075424886625c7bb4aed4cb3359fbcb3463e8eaeb186434532eed4612db7968d1d59349013e179c3ef25f241f5070c244358
+DIST ark-18.04.3.tar.xz 1973656 BLAKE2B afa413156233a31a1c7d102799b347b6879453a4c0a870511cb9040c9160c4da4eab30722ad9ec07ec1e9b68e942c137c464e0054738d8ee3632546b49c9dc93 SHA512 39348d3cbd3ed044ecc40a235c3e93dacb638e3ea867f814c722630786fbf7ea48643f967fb46f3358c64966a250306f11ab2a76c9147bc135ba826bcce9d33d
diff --git a/kde-apps/ark/ark-18.04.2.ebuild b/kde-apps/ark/ark-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ark/ark-18.04.2.ebuild
rename to kde-apps/ark/ark-18.04.3.ebuild
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 1c291899a101..c0dfb9765691 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,2 +1,2 @@
 DIST artikulate-17.12.3.tar.xz 3747444 BLAKE2B 69ab847203f3a6ee408435320d3973d48d55501010ce34c329605ea653cd26a0e2c8a082fba3d91e610f153193441db310cd58416ba6f1907d3680f35197f6f2 SHA512 b984eb53a78bac012a9918a24d995dd89413225ebbd0bda29dd6840ccb14f40efc14b80b0ea6a5df335dcf28f7bb45ad8d1af8296a8d761e4ae48288f2354a23
-DIST artikulate-18.04.2.tar.xz 3747856 BLAKE2B 97add140fcca2da11881416b188df5e57d433d2df96385aa3d09416ce8f4d55b436f4e0105e04734bd02ac4f353252f5e53c8dc911f19d3556d762e33500cb86 SHA512 924ba33422fd8814efd72dacc3276683e14cf52fb1409b03ae76c357018044662dd95b7153b8e8d216199242b0c67fdf4039b52009203195288a4259fc670e15
+DIST artikulate-18.04.3.tar.xz 3748684 BLAKE2B ba7c6a78c6e5fb074b610beb60dccbbe3b159a9df90ef2c65e9e7a2d4c44ec6665ef1ca1644043e104624a31c17c4a4e9f8dc9baafb17bb7b9a356d4d6933135 SHA512 4fa7c6d24d0dd13bb3810545426a626d1c84c72b083e410b70524aa4cbe621f577494b8f60c309dbecdab036353cc9fffb6c8fcf71a3607f13469001395f474f
diff --git a/kde-apps/artikulate/artikulate-18.04.2.ebuild b/kde-apps/artikulate/artikulate-18.04.3.ebuild
similarity index 100%
rename from kde-apps/artikulate/artikulate-18.04.2.ebuild
rename to kde-apps/artikulate/artikulate-18.04.3.ebuild
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 892a158f1092..0db19046d90e 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,2 +1,2 @@
 DIST audiocd-kio-17.12.3.tar.xz 248320 BLAKE2B cc9fd7471fa91c9cc026f9c7b2bc7dd20e8a507ef92a01b170c5fb0f011af31e562eb1f2f848ad6747ccba665c8144e2db01782ea7008eabe5532200e29db5cf SHA512 9d21ba053acd9d9f717aa8e7c3b3021e1f24610762f332584bfd4ce1b4f61b10daf0c6715ed4168f37bb36d4551d43d88a8eea54da313aac7cb6df862680f2a5
-DIST audiocd-kio-18.04.2.tar.xz 248924 BLAKE2B a5c1335c34832f5c7170e849c90ba8b82ede2795dc6941c96ac536b8c3c2cd912236b672921dbd2e57a9bc67ae5adb1fb842ee43f07438e43da5e5106a9d99d2 SHA512 aec0b7d6f61d5e00dba42df59949018d42396ffb06bbff5c551ed6817372bfccb0f78d31e9982362a60a87c2f6aa69e68c89d71fdc3a1424e509fe384e69ea20
+DIST audiocd-kio-18.04.3.tar.xz 248668 BLAKE2B e4cf5c7f944f6dbed42af6ae749d3c24f48f974086d03494934ec1c9a394304e885177b277bd83ca9a29d07a11cbd53bf79adb7396f4e1d354088382394d4ece SHA512 a7f8a090019420e735471ed0ae7988145701212b453f958f0da3643e85503de236245a3bb24024449bb6fc50883eb475f450cf8674aed2b166a7e4ef4cedf32e
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.04.2.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.04.3.ebuild
similarity index 100%
rename from kde-apps/audiocd-kio/audiocd-kio-18.04.2.ebuild
rename to kde-apps/audiocd-kio/audiocd-kio-18.04.3.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index eaa348a5c9da..6052ef46ac99 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,2 +1,2 @@
 DIST baloo-widgets-17.12.3.tar.xz 151088 BLAKE2B 00cbad49940063cdf3f8b5f6b3cf2c29e81c5c6b2d34de9eef604bdfbcf1e55a2b606aefd6a9616d11dc8ef00c220c7fe7d0da65eacb6b057bb807330cca7677 SHA512 82237401900789b624fd5c7111127e053fad0f13bcd56f9edc063604fd9bb6368de27d5a62fc844c24b0e283da01f5b77135e7a021b880b026931ae1e583a97f
-DIST baloo-widgets-18.04.2.tar.xz 244876 BLAKE2B 58acd9cdb0da2003e3f0d7d93005eeaafaaeb3132068615d9c0f217d2f6b92e7436ac5493a13598d546c293f433aa2e478d45ef71af68a7412e4d35b0946b495 SHA512 7b00e02ce3345282fff34cdb934ec69151d194f65cf40a3ee634e11b26173e1090cd5a548764ddc1447cc19de79ad495a68b039d984f6566da4479719f2967ce
+DIST baloo-widgets-18.04.3.tar.xz 244960 BLAKE2B d8b9d80e7a84958ead24d5371a582c7de8fbe6adaa05faf49c66a4613c03daabd12acbbf9288df80a922e8ce3a611728cc2059a1814cd03d54a3c3e584d29112 SHA512 d267d43d75a6139f78961f47b12882e2cd4dec17e31a60de5b0d0d133a895a36b12bafa68b121f84b7a15f692ebd1219b055197785183fc1b86e59b754eb5e07
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.04.2.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.04.3.ebuild
similarity index 100%
rename from kde-apps/baloo-widgets/baloo-widgets-18.04.2.ebuild
rename to kde-apps/baloo-widgets/baloo-widgets-18.04.3.ebuild
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 8fd261ea645e..326798db45ca 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,2 +1,2 @@
 DIST blinken-17.12.3.tar.xz 2505872 BLAKE2B 304cf939db4bd4609a0bda247119803d0cedb276d99bd7c3ea4cc449dc85c2cf5db1a474ffa79dd09087fbb9cf8dd8e2e1405d02ee5d8f5d265202dc898556bc SHA512 9cd1ce9f74f94d7beab0192f59114459d3434f341f3ad2d83dc6b659f70e6fbfeafd21ead5ae22f4f07fc03ed2d9da85ad59703f6d6af879355575cf7db07494
-DIST blinken-18.04.2.tar.xz 2507808 BLAKE2B b6ca67e3da758666ee2b271184afd0dea931b695dad5d41c234bc0412337fa08b9deb790121f7ecf5cafbbb79f320eeb73b4bb81603a3bbd3feb8adad7c90b44 SHA512 608be8da79d61ea6cdccea7426ae4088d2334cacfb4325cc6a69e52ffe41ad9cb349e39f40bc99d25e6381b206597d7722fc7c104325e8548171ce72113c4a96
+DIST blinken-18.04.3.tar.xz 2507660 BLAKE2B 0b002c616bffba1716837e23aedc31f7401842589d3d8d4f029df5245c81eaa5a0213345619234ac85e0e1ff97091f2daeace65c59b5911f70d35addecb30966 SHA512 55a02b9c1041c8cf554431f338f4117300a25c5976f01c6ba3a3b28e66f0ea9742fb0dcd4fd25cb69a3ba5c41ef3b7633ae1259672a8e8175687ff17130920cc
diff --git a/kde-apps/blinken/blinken-18.04.2.ebuild b/kde-apps/blinken/blinken-18.04.3.ebuild
similarity index 100%
rename from kde-apps/blinken/blinken-18.04.2.ebuild
rename to kde-apps/blinken/blinken-18.04.3.ebuild
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 8a3947dba928..63ff4a442782 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,2 +1,2 @@
 DIST bomber-17.12.3.tar.xz 753868 BLAKE2B e865f2c565eea5def26687c3dc813aa40aca0468e6754f9bbb349266fcceda609f7f8260eb44e2313f253a893892edd00456b517642939028921489b8bf9d3f0 SHA512 3c792fd103b93a2ec5e9b030382256cdba1c05477e04e8d95d0a331dd630d88137e0079fd1b91f267ccbc1c32a60e4c94f34330061380b0a069f689b90efb6ec
-DIST bomber-18.04.2.tar.xz 754712 BLAKE2B fd669ca5dbc8f1d8f862d33afcf75c48bd37cc933d3b6022cb35ab3b7e2a04a965421bde8242a212ecebd7890aa956b6083d77f41f3a65d943bf4ec4d3ff64ce SHA512 b362f0d891270269a1eb15a8bc5d7e4d6d2cffc1fd84227ce2f507f9fa7bfb3975c931628d03e9e25513bac28c5f82debf6410c368aa7203c160525f38cdecdb
+DIST bomber-18.04.3.tar.xz 754288 BLAKE2B 5c30c435dee98ce851fec3723148d62db815ebc3aabc7a76aa5f9ed4357cc55fd2a2d695cdeb68f729d2d93132d1804b0df79ab895b00094d6ff2703c9dbc443 SHA512 40297bfa9c3fb543a8f8903a70fe7e7987d9fd5ba063ab1de2cf58801ced0249f4b9019aa7492ee30f027c74cde8c0fe268888835e37ae56b0621dcdf8f30811
diff --git a/kde-apps/bomber/bomber-18.04.2.ebuild b/kde-apps/bomber/bomber-18.04.3.ebuild
similarity index 100%
rename from kde-apps/bomber/bomber-18.04.2.ebuild
rename to kde-apps/bomber/bomber-18.04.3.ebuild
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index b2e1507fc0b8..340209a592cf 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,2 +1,2 @@
 DIST bovo-17.12.3.tar.xz 186488 BLAKE2B b3cf4a9d6b168e9197290d9fb50698b60122a07e91a732ba2f75b50ae6821bec9dfea41142c1e40e982db53f61026e82fa9370cfa39cc2edb3d605cac579eb45 SHA512 11b626795fef8bf8bd30f086e759d26a8f63f74c05dd155506121e5251e2f2e07cd67f3f337a6eb0b567b96c73980875cfbf02ebfdec3f5e13062e2aff21fe76
-DIST bovo-18.04.2.tar.xz 186572 BLAKE2B b5f0b06ed25dcff180c10fd7cbe6e762d9be69b29d81481aba750c89acd87a6995595343803e732400623cd9bb354015a4fced1523dc170a6db7babd5e41f3d5 SHA512 b794caf7189b29e8311c04928a66bd76f9ec0cd780c57e90d2303d7d280038708b42efe85bf392eb99ee98d0718f11178b736fd2f7272a8186aea0a457e3ce4d
+DIST bovo-18.04.3.tar.xz 186428 BLAKE2B a11d7a44b0d1489c677b1d5fe102ea7e1f5b8680f74c8dfb316c01044e82b87cb6c8acc42529d5948bcad74034f2392a698ebedfb442a0eb040d0ad00ea374a7 SHA512 f2efdb2e1f929febc0c1e7ed896d0067e61b3f8cc08616396718e9b79c60737921ea352d8cd4450358ee7b06d74d7130f5890fa993a4b23ecc35681ca3fcee8c
diff --git a/kde-apps/bovo/bovo-18.04.2.ebuild b/kde-apps/bovo/bovo-18.04.3.ebuild
similarity index 100%
rename from kde-apps/bovo/bovo-18.04.2.ebuild
rename to kde-apps/bovo/bovo-18.04.3.ebuild
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 5717721585b7..19e829e6a85d 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
-DIST akonadi-calendar-tools-18.04.2.tar.xz 221200 BLAKE2B 6c978bbe881ca6272ea457302f0eee0ff0f57ebdb4b0c5fb2a50cc50c7ca84457cd4ccbca609f6ee0fdacdf45cb719dc5b0b98fc982f06643bb43155434416ae SHA512 2cd4fea39b0e79d699ecd9be711b0061d6e6190b97add422a572889c6882666fb75d2507a4ccbb69c9bfdbb62daf28316940ff635f19e3b8a867003017abafe6
+DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.04.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.04.3.ebuild
similarity index 100%
rename from kde-apps/calendarjanitor/calendarjanitor-18.04.2.ebuild
rename to kde-apps/calendarjanitor/calendarjanitor-18.04.3.ebuild
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 439dfb7a8e74..7746ffc9826c 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1,2 @@
 DIST calendarsupport-17.12.3.tar.xz 644864 BLAKE2B 52733e61d06eb1335f5e104daa073be87123c71af99dd2894934275b71b7a61478ac7853954492681327b5047a85dbaf7d634ca7bc53fefd115d3d2148e76048 SHA512 db578210c496c0e127e3c11efeb71cdd1bf56d0e61db6b82528ca036dbe83bb08338598863e51e7c8bead8f83169e1ecfb6080231e2bb97678c3b078fb12ee22
-DIST calendarsupport-18.04.2.tar.xz 647164 BLAKE2B c38d8b6bbba8328dbc50c1d55ea0117250017440b2b7394b9626b3c709f46a776ac0f3389973028d404d1d39a36c58cfc64bad6bcef7fd53b63a51f58e2a1276 SHA512 d321751fc1ab61583ae444262dbcec6b09dce70dfc7c9ba6cbdf05d3d1a9c6cc5d28a3d19f3982cb447df813bbe34c258dd95b0f784007ac95fcc8b72366d177
+DIST calendarsupport-18.04.3.tar.xz 647108 BLAKE2B 8088fcf42474e9b876e57135dcaccad97fdf4f433f57fd72886c1d94d7086471f1b76a08aff5df24f2cdb9891da041dfcf444951f908837ebb3aa53bc58b332d SHA512 7631d81bfbd3282448d4d78cf05a4714392736a74e23155b4c75f288a906975ea1bd32e3412e03b8ff74778e85560a071a11482c35cf769a738675c4fedd3e6e
diff --git a/kde-apps/calendarsupport/calendarsupport-18.04.2.ebuild b/kde-apps/calendarsupport/calendarsupport-18.04.3.ebuild
similarity index 100%
rename from kde-apps/calendarsupport/calendarsupport-18.04.2.ebuild
rename to kde-apps/calendarsupport/calendarsupport-18.04.3.ebuild
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index cc83aba2b430..f9e179d6eb0a 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,2 +1,2 @@
 DIST cantor-17.12.3.tar.xz 1066992 BLAKE2B fdaaa42adf45b3013337374b83b6da77d6adfd610e233d56a80965f35f3433b412d4f1279a3c2c3e257a57a69b44d7e190f42e325f0fd3fa5ef4223ce6ddbfb7 SHA512 37d080fa3e87cbd105e33c687b5bc670c0833639873c41e1dcc519577103186ec629c85b5a1875af915267eb7ca3d13f170894bb9c0c882c964ccc02a24cfa3b
-DIST cantor-18.04.2.tar.xz 1071952 BLAKE2B fcccf731040f49229ba43e5cf00a052f8e7d93736536c63a9b92c93423794e927ea295f292295f2f6ed5844fc3bdf08367907439f3ef9e47900549c8bf6f2c63 SHA512 40b57c65606c771f96d8439eb192436dab7eca126a6d9e6d0b985aff3f11b340e4e3f42c182bceb5f954d2e695f8e13b739685d6c4389fdbcc07a4e99a936d40
+DIST cantor-18.04.3.tar.xz 2179372 BLAKE2B 1f6055359d239bd3f49d4a95975a13db710bb7aabb708b3e045aebc2b95ae8d9ab875486ea6735104d8df6bf53bfdccc6349e627e7ab32596bb0cfda83db31a0 SHA512 2493d2570f69d0f27489dd86b48a11fa454c4b0d42b821a52ee6489ed6914af826b94a152098144cda40122ddf98d7b121b03c2e4e4b46dc85db83643873d2bb
diff --git a/kde-apps/cantor/cantor-18.04.2.ebuild b/kde-apps/cantor/cantor-18.04.3.ebuild
similarity index 100%
rename from kde-apps/cantor/cantor-18.04.2.ebuild
rename to kde-apps/cantor/cantor-18.04.3.ebuild
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 87ce1769779b..fcfefc033aa5 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,2 +1,2 @@
 DIST cervisia-17.12.3.tar.xz 1905900 BLAKE2B 8ada882e8bd19a272eb622a0bdb5e9fa9a20ed0c31c4b05ecde68f969288907ce00ea4ebd1c541aa8f5e51e3ca248b8413cd86611e96ca94e186cd6edd1e70b4 SHA512 fed1fdb51cba8eb2e02139095fc250f4d4cbed261a815cc9e8cb12df193da79440026730aad4fdda73759a4b8571776014a74b5d0517637d2fd2d86432e947c5
-DIST cervisia-18.04.2.tar.xz 1906876 BLAKE2B 8021ef587ed52b942b26922bd96a2a0b9eb58ac32f54df0ed754c96420c54ba0c6e99ad077fcee9d135ad3a1f6f743cf61e236e551d19a751ec06c8ffe65eb7b SHA512 2116fb68979f5faaa6f419fd872bcacfbc83bf5e03b946da660f07d7a4503ed5124f9c2b76cd4a3bbf9adf4511fba92e29106773339f8e74fb522eceab977d1a
+DIST cervisia-18.04.3.tar.xz 1906444 BLAKE2B 3c098bb67c52096edb709ce3dc1e88d812e9b5077feea3cfc3691bc17820353eb82921b9c914bdd168603ecc7274d35f56f2983e06eced6f5a76e6dc938fac5f SHA512 de058407f70e2c7568c925e7ff28ffdd9811065cf9fca9782cddd85650d55652c1a420fe7f89aee99ae01f0373fa52a17759a40f8310496e6af45ae5529b0193
diff --git a/kde-apps/cervisia/cervisia-18.04.2.ebuild b/kde-apps/cervisia/cervisia-18.04.3.ebuild
similarity index 100%
rename from kde-apps/cervisia/cervisia-18.04.2.ebuild
rename to kde-apps/cervisia/cervisia-18.04.3.ebuild
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index c3c537f1c04a..57d7f1f46819 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-17.12.3.tar.xz 187288 BLAKE2B 205db4fddf395f5e1c7ac9db123984f712867d2523b916ba0017525872a56460c2540dacc6b4e49cb3e876d3d504f619ef603372e98622d1634804cf5bee4efd SHA512 fe0e2aabea0870e8f3127178a10c70264fd339391f88aa9e2a1a5238cb25a0ef47ab2c66f60d2da0788a41399cdfd4099542c81d47e8db1ea09cf2f5941fdeaa
-DIST dolphin-plugins-18.04.2.tar.xz 189956 BLAKE2B c84d4f45c67b9d394cab0e05ca06755d49f2b734d711cf725bcebebdbede9f192e47eed475903dbd3f820ebd739db8c7a570bf6ae7a7e56736b61cae14a2117a SHA512 4218793e03fd6adc55c489e9b2a9336c2982fdccc2cd1cf1ff95ea7efe6aa32399bad7d0093c70e2d788410ab566152f8511c7f0d0c4a5597eeab7b3f461de89
+DIST dolphin-plugins-18.04.3.tar.xz 191408 BLAKE2B e27bd189d02f922e55fb216bfb80032bf611ec109a3c3f9e3b2cd2466f831e59d548c2d2861a784972e7dcc676e1e7baf28f9a44e8ce7cf1569846da4d6cb86a SHA512 641562f44750bad8ca431be470cf691ea72647ac2b6c5bef7ff83d1d538bc13b7f8d082589c0d2c8c208c14a6007e412f4be8a8e733ebde7132dca6d5724798e
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.2.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild
similarity index 100%
rename from kde-apps/dolphin-plugins/dolphin-plugins-18.04.2.ebuild
rename to kde-apps/dolphin-plugins/dolphin-plugins-18.04.3.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index d894c9d2d7bb..db123a13638b 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
-DIST dolphin-18.04.2.tar.xz 4850780 BLAKE2B 001fcd1f3fabfe449d5b6ac82763dcba0bfb3aa5303e54b2f72c105521deddd7f0264c435da9471cca5978d69afccb391810c1b6b4ee69f5f66f39034e8e1484 SHA512 760e698903717f30c08d69ae5872b1d42c523d6a554a6570cda6bfbd4fe2c37f2744e461728e7d090cfab6bed0055bf48b8cbb38128503386698f71c5d5f5198
+DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21
diff --git a/kde-apps/dolphin/dolphin-18.04.2.ebuild b/kde-apps/dolphin/dolphin-18.04.2.ebuild
deleted file mode 100644
index 45f931da6b12..000000000000
--- a/kde-apps/dolphin/dolphin-18.04.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="~amd64 ~x86"
-IUSE="semantic-desktop thumbnail"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-	!semantic-desktop? (
-		$(add_frameworks_dep kdelibs4support)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	thumbnail? (
-		$(add_kdeapps_dep ffmpegthumbs)
-		$(add_kdeapps_dep thumbnailers)
-	)
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.04.1-flto.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/ark:${SLOT}" ; then
-		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-18.04.3.ebuild b/kde-apps/dolphin/dolphin-18.04.3.ebuild
new file mode 100644
index 000000000000..7688b7f2c3b5
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-18.04.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-18.04.1-flto.patch"
+	"${FILESDIR}/${PN}-18.04.3-root-user.patch"
+	"${FILESDIR}/${PN}-18.04.3-root-warn.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+	fi
+}
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch
new file mode 100644
index 000000000000..04baafa1d8e8
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch
@@ -0,0 +1,56 @@
+From 40453cb627a39f1ff92373f865426f0bcdc83419 Mon Sep 17 00:00:00 2001
+From: Nathaniel Graham <nate@kde.org>
+Date: Wed, 9 May 2018 17:18:08 -0600
+Subject: Re-allow running Dolphin as the root user (but still not using sudo)
+
+Summary:
+Prohibiting the use of Dolphin as the actual root user (not using `sudo` or `kdesu`) breaks legitimate use cases for using the root user. An example is Kali, a distro that logs in as the root user by default as a deliberate design choice.
+
+In such an environment, there is no additional security vulnerability beyond what you're already potentially exposing yourself to. So, let's re-enable it.
+
+BUG: 387974
+FIXED-IN: 18.08.0
+
+Test Plan:
+- Log in as normal user and run `sudo dolphin`: you get an error message.
+- Log in as normal user and run `kdesu dolphin`: you get an error message.
+- Log in as the root user and run dolphin normally: it works.
+
+Reviewers: markg, elvisangelaccio, #dolphin
+
+Reviewed By: markg
+
+Subscribers: chinmoyr, cfeck, elvisangelaccio, mmustac, Fuchs, markg, graesslin, nicolasfella, zzag, kfm-devel, emmanuelp
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12795
+---
+ src/main.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index db52e11..75bab67 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -43,10 +43,15 @@
+ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    // Check whether we are running as root
++    // Prohibit using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+-        std::cout << "Executing Dolphin as root is not possible." << std::endl;
+-        return EXIT_FAILURE;
++        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
++            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
++            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        }
+     }
+ #endif
+ 
+-- 
+cgit v0.11.2
diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch
new file mode 100644
index 000000000000..bd6e2ab0d815
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch
@@ -0,0 +1,45 @@
+From 621cd24acfec8cbed19e9aa6ff8650cd6f38f809 Mon Sep 17 00:00:00 2001
+From: Nathaniel Graham <nate@kde.org>
+Date: Sun, 6 May 2018 17:48:54 -0600
+Subject: Show a warning when running as the root user
+
+Summary: Now that Dolphin can be run as the root user again, let's show a warning.
+
+Test Plan:
+When run with the root user account:
+{F5882057}
+
+Reviewers: #dolphin, markg, elvisangelaccio
+
+Reviewed By: markg, elvisangelaccio
+
+Subscribers: acooligan, anthonyfieroni, chinmoyr, kfm-devel, rikmills, emmanuelp, zzag, nicolasfella, elvisangelaccio, Fuchs, mmustac, markg
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12732
+---
+ src/dolphinviewcontainer.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
+index bf8ac88..7b99595 100644
+--- a/src/dolphinviewcontainer.cpp
++++ b/src/dolphinviewcontainer.cpp
+@@ -108,6 +108,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
+     m_messageWidget->setCloseButtonVisible(true);
+     m_messageWidget->hide();
+ 
++#ifndef Q_OS_WIN
++    if (getuid() == 0) {
++
++        // We must be logged in as the root user; show a big scary warning
++        showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);
++    }
++#endif
++
+     m_view = new DolphinView(url, this);
+     connect(m_view, &DolphinView::urlChanged,
+             m_urlNavigator, &KUrlNavigator::setLocationUrl);
+-- 
+cgit v0.11.2
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index e52f0c2d4b48..59a6587e1905 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,2 +1,2 @@
 DIST dragon-17.12.3.tar.xz 1464016 BLAKE2B 54360c45227c2260b4b401978e902de4777a5357812f93d73952938e6400196369e4b41777809619aa8cf2c0bf9a840b47ab71fbd3348e61f37de8943d1fd227 SHA512 0ba2e1845d6b6fcb3885e340160f37d924afd5d5b1a8f1f3e196ad5b04db87d55d1460feb447e0845802757e3b81d550fafcfca2e91bf334209953fc4466eef8
-DIST dragon-18.04.2.tar.xz 1729252 BLAKE2B d3150a269e0601ded56d427ecde54dea1137b40392a90df1abf9bf2998183fabca9d7f67e3a987b51579c0c1bf6612597ac57b37c9c53e65bb8535c7ec2df9c9 SHA512 8aab6d05672cb9420a27b1320dae2bd95b74848ee4e3e8f0cc02dc06cefd2ca3e27870051441d0c7912c9440bb626f69730a70f09cb4c91c664954b532ee6a97
+DIST dragon-18.04.3.tar.xz 1729144 BLAKE2B 4832bcdc8d01a97f85cf89e928e2bf503d9b7343a5e374a6c2b20fdef82676fd0263e60a8f2e3adad4f18afb071e42dadf42548fa3d81b08152baf6e8b0046f6 SHA512 5dd3a0157cbac092a0bb224c38dab6706545fd78103e98b060860c5465c6454c4c3a2ea4e646a99f4683a61d8c1248e3a7d2c5f5e69f7e711d6f3ac16ab198fd
diff --git a/kde-apps/dragon/dragon-18.04.2.ebuild b/kde-apps/dragon/dragon-18.04.3.ebuild
similarity index 100%
rename from kde-apps/dragon/dragon-18.04.2.ebuild
rename to kde-apps/dragon/dragon-18.04.3.ebuild
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 3991d7aba387..2c562ebe933a 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1,2 @@
 DIST eventviews-17.12.3.tar.xz 437868 BLAKE2B 294cfcbb750ae81714257b56dd7f2c7817be8182331ec3517c96e17858997f1e3c49b3ecbce27e906c9485fdbc2f2bcab94131fc9365a0fc484b799ef2e29877 SHA512 6a51eef25eb9ab0522c95ec4ed800af94e5a1243b597e7aee4619a1494bdcd26b08df4d42d04d837c561f5c0d3434edba9f4a72fdd2433816ad3e9e0e6b6bbae
-DIST eventviews-18.04.2.tar.xz 441572 BLAKE2B 21555db4f717121c10b089079c0cc0f608ff8a613ed56d95dd84767fc6e12b298fec793780bda021f41c77a28b4324a102193f45787986cb7a3f41ee74b1b384 SHA512 428981bb3cd35fda4c220009579daf1902bd6f4e3fbdc18d0cf00096099d12f74cd22b1272e5c86132cab5e6dc02d1a07bcb0e2dfdc2428b62c54ca16eb14a90
+DIST eventviews-18.04.3.tar.xz 441572 BLAKE2B 1c9fb9c5e6e23c0d068ed4183c5ea90f459ed23b86ada2955477e89e4cf0d86d95b4779cec63dfa8b4d8743198efee520caf665db2d448ea16d5eea54c962680 SHA512 d6a202a31cfe9f4765f5915c6cf5542b9d1e9ffe309eba40dc00690d6281951404d14b6e4e0d7f71c8d1b9a5ad72ef5ca0bed326e462ebe574678317be34c1a1
diff --git a/kde-apps/eventviews/eventviews-18.04.2.ebuild b/kde-apps/eventviews/eventviews-18.04.3.ebuild
similarity index 100%
rename from kde-apps/eventviews/eventviews-18.04.2.ebuild
rename to kde-apps/eventviews/eventviews-18.04.3.ebuild
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 1a1533400744..f42a022a1adc 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,2 +1,2 @@
 DIST ffmpegthumbs-17.12.3.tar.xz 21100 BLAKE2B 6f0ee8bd6c8d775c463734e83c44ee6a59cb52d7d8a622aa33b10e57b944f26aee5f453fc2cfe153d6d970114b19d524811681447eb01f5d8b16bd90e1897bcb SHA512 923bd21bc7e27c3ed511c987ae8011066b713acf6f14794c00cb26a0c6c3d8859a88db02c88ec5cfbc4210dd4a252dddcbbbe6e768d386617b26af3ea9b5184d
-DIST ffmpegthumbs-18.04.2.tar.xz 21220 BLAKE2B de63786ec9b156073d17eaa5c7fd6bb26c50bdd556efb3493dd48d1d3640a041786b473c3dff141844f3a2ffd16cc6b95a193f34de5c94560e9f4984629655a9 SHA512 b24c02dd75c408fa91bd8e8a156cdf22ff9af3033d3f39ceeed2d83d0f42d0324778076d081c2769ac9a7a64978492567999588e16c73ae6c86056598fcea178
+DIST ffmpegthumbs-18.04.3.tar.xz 21208 BLAKE2B de6b446436f99ab502eb63a897cc4e62403fd88202b7d3a026d8d3a373e30c22bc65b72afaaecc1a37c543b1951ccff2f48a654228bc94be90493c97d3ceacdd SHA512 5ec858f4829bbc0ae480b908520f2f19cfb3dfcde2d3f8d357e3c671a84cb9734f0e4041eb35a625aecb2abe94e54f18e44bfe7e85afdad00c941e4a1065eba3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.2.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.2.ebuild
rename to kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.3.ebuild
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index ab48a1c01223..68df264d0621 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,2 +1,2 @@
 DIST filelight-17.12.3.tar.xz 654916 BLAKE2B 3543b15b6a1c691769c01aa24bcb8b8b3f1b81d0060ebb7409e8f22749fa6b08cd5ca0eff94e6a950c6f027bf3c56afcf7f43cee27192a34284509e3d6a8d670 SHA512 6c8efe81b54bc5fa0111d94c65a15a6a2beb079790bb741a38f336baff417eb5c8d6d133063afbd538378b5aadea08d221915cfaab8430fc4dc32a889c2057bc
-DIST filelight-18.04.2.tar.xz 659100 BLAKE2B fb199e4a3f2dff1807a8d17ff2ebf88fb1b084aa638fb9600c18afa653bd05ebc972ac778071a59a558e3702a0963bb160553d187b4c88134f911a0b28816605 SHA512 380d6f5c0811220d72b7c411339e9ae778ae2ee4e472f87cf73af56cee39369e794598ee0601c8181cc0815579305de3af1b562e4d2edc43f2e70250c80f9e2d
+DIST filelight-18.04.3.tar.xz 659376 BLAKE2B db637bfc183a893cb19d802084c490a983d9e6bab6e9fa7bce9896d6e6e24d93f769e3334bdb667ae656882e3658cdb9d7417618a019a3d44c08850e3a549504 SHA512 a938a23b150d0c3caba453e1a9e60532d5da24caeec7bffbd781363a0b79fd5fc8a2a6875b67a42beb5d9bc9598145bd8f58b9718ef39166f5738a9dcb303890
diff --git a/kde-apps/filelight/filelight-18.04.2.ebuild b/kde-apps/filelight/filelight-18.04.3.ebuild
similarity index 100%
rename from kde-apps/filelight/filelight-18.04.2.ebuild
rename to kde-apps/filelight/filelight-18.04.3.ebuild
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 4ba39ce0a8b7..b652c815ac8b 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,2 +1,2 @@
 DIST granatier-17.12.3.tar.xz 1959944 BLAKE2B 8b25ade780f0679f722eb3a4e323adc73c2e3c3d774595a934bdb2d6017eb0588e2163b0610bb90dd2277a0dbd9e6df590c2fdc238d36d80e50b335abd8702cf SHA512 9d3b8f53452a345a3c48547dc04bb1e58ab35f8d25b0e7611fba4adddefd04b705b681aa24e7e504e742a65b025b0ef5869d1959de9199f2f6d5681bbf7290fc
-DIST granatier-18.04.2.tar.xz 1961320 BLAKE2B 93e424d0c31a6cd657e7de658ca49a689f3d6b4cce29b18aec42e53cc8bac8094900e97894f26f3de6754552e019a32fa59255d8196f5cefcc0492a293d7b049 SHA512 afc46a2253885e88a8656260df46b18d5c649dd5e7ef27e18e6aadfa14c7cde57c87db05791dbe9e7002c00b4a381f586b6d2e4afce7b4c75cda3aae159478bc
+DIST granatier-18.04.3.tar.xz 1961648 BLAKE2B d1a14db7fbb3bc07ec19f4db4a142aab54196e7612a0341873877c6a74f000970e3720f0e2640d3a72cfde6e993058ce9ba0a08c01f2b316f6ba76f323ccd7e8 SHA512 c39fe20c1d88fd8d521e0db91df46535488efbaba27f48faef63e015d9806b3d66a81831edb9b8bb0508954f79822b70ed47b7c3409601a6102c8e7d32304339
diff --git a/kde-apps/granatier/granatier-18.04.2.ebuild b/kde-apps/granatier/granatier-18.04.3.ebuild
similarity index 100%
rename from kde-apps/granatier/granatier-18.04.2.ebuild
rename to kde-apps/granatier/granatier-18.04.3.ebuild
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 30fbf9cb7eae..501bfab5076a 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1,2 @@
 DIST grantlee-editor-17.12.3.tar.xz 110752 BLAKE2B 2d0e60207bcf1edd1bd4e69e7a959c59e0e63b14117bafd402f8fa57aea2a1c1eb30c152ab3a70498691e854241046d6ca1ee9ffb3c8303393c6a629244c6be6 SHA512 722db8e101c7132717840137d77dc8c0972a2f1692b4b0d8be3e33c296649d0d5f30f55b4cc6e1dfa58778a3c470c93baae0b060d234a99f967e87296e947f0b
-DIST grantlee-editor-18.04.2.tar.xz 111264 BLAKE2B a3a8e1cca4d945a830a35b392273f1d9389eda14c8ff135cebc38d70dcdae284b4baa6b0bd139dc89f812fd8091aaa259a44b03ed91e54ac43307d23154ef85c SHA512 aa825d2486c253c5673dfbb9dc874e22a48b05df96e21bd90704af3f5ed5c1ca0c23b8684b0c75f78dc706268c87dfcd5205720a74e0227f371c9fdc1624e13e
+DIST grantlee-editor-18.04.3.tar.xz 111032 BLAKE2B ac0c177c5f2038d941e172e84155ae4de33183a13a5e522b6ff39eaa402ac41e80fa53cbe2c56351943568fcd33ac2de7eefa59489c68f3ca4663cbe7dad425b SHA512 6eb55fe1632dbee7fd2d632642460a8c6471d801e877be241a519fb1f103154844a01949b0e5db0b833351c6fb496e3dd34998acf1634817c1319b173be15acb
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.04.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.04.3.ebuild
similarity index 100%
rename from kde-apps/grantlee-editor/grantlee-editor-18.04.2.ebuild
rename to kde-apps/grantlee-editor/grantlee-editor-18.04.3.ebuild
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index a790593a5f2d..6377ed797dc1 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1,2 @@
 DIST grantleetheme-17.12.3.tar.xz 51348 BLAKE2B 89055379524d9273b2db9185c1f0116638e5f45414ba674cb7d2511e9539d556daf489e9a54f39a3c1197a8b1939076ccb7bd932d336c0769b97d2c7e59a8062 SHA512 203fd80f303d4c2c76b9375179da9aa7f040416b397ce576ee5836b2bc8d04109601275bad843a192317971852f97c9a7fa83b48401da14ec820f11706187928
-DIST grantleetheme-18.04.2.tar.xz 51684 BLAKE2B bdd2ef509b892778c7f391f21f838b3fda99691f916f59c5c73231df4f74a0e8ac5ffda39ae0576fe8aecc37669c41398d2908648a79b5807022cf2e1cca5332 SHA512 c08a7fac35dbac514ffd0da7dd447d1e4a8bcc52f18df387224c6823bce03b816a20985e67ab105665491f1b96baa1826a31809802318d0871099a5463cee463
+DIST grantleetheme-18.04.3.tar.xz 51676 BLAKE2B 97db8d46c7e99d1cf3a3ef61dfc579564adfa80d4d5aa21faa29cd94c332c9f3c6ce8e9845a3c6f1555be5a95c7cd603bd8c5372c69f1cf1296bddc96580ce17 SHA512 5f5ded0dcfba8759101807f2fe2148b9af07043da05a5357be7614e4a26660c9f50b41206bd6dfadd9b659ed08d55f9f76c47e076a1cccb3f595209441de4010
diff --git a/kde-apps/grantleetheme/grantleetheme-18.04.2.ebuild b/kde-apps/grantleetheme/grantleetheme-18.04.3.ebuild
similarity index 100%
rename from kde-apps/grantleetheme/grantleetheme-18.04.2.ebuild
rename to kde-apps/grantleetheme/grantleetheme-18.04.3.ebuild
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 7ee09320b890..c6a0c15594c0 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,2 +1,2 @@
 DIST gwenview-17.12.3.tar.xz 6021476 BLAKE2B a4142239cfe4d82b26977d788a67286625d7469ce4722a1c091691c02abe75ceb5b852e4754b6c3809fc96219b0a967595cd83910e8b809c553adaa0397ee939 SHA512 7691e07f6ec572a46a8b0c3e63aba93d7a3c2886384370d3d77299c94e7f9cc5f7dff4e45390cc6871bc003da27ce0f90d85d8108a7302657bc3f0175e609abf
-DIST gwenview-18.04.2.tar.xz 6055820 BLAKE2B 130a9dfcb69bf7da3a89c45c6a733824e24a17b0c582fb475e5ed51abc9e00f112e7edc32030ffb04db4e156a6a958678a527ea0c504dbb0c6fdd74d264dfc19 SHA512 ea9fdbc88dedbdfc2f15d431a28e2d8df010ed880cf29380b3b6bccd8cc7a93f06b980d2b4491ce3c7244767ed8eddbd8089450762aec3711514e98de8ccf758
+DIST gwenview-18.04.3.tar.xz 6055876 BLAKE2B 5202dcfe597ad1da7d5b18124ec357239a26a30c20d83c37bc7258e0ad4232b53081a8e050017850ea6eeb02fe0d88f90b90b0029e364929375d3e09dc8bf7fd SHA512 a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f
diff --git a/kde-apps/gwenview/gwenview-18.04.2.ebuild b/kde-apps/gwenview/gwenview-18.04.3.ebuild
similarity index 100%
rename from kde-apps/gwenview/gwenview-18.04.2.ebuild
rename to kde-apps/gwenview/gwenview-18.04.3.ebuild
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index a71ddcb070ee..2c6cf69297a1 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1,2 @@
 DIST incidenceeditor-17.12.3.tar.xz 517144 BLAKE2B edbf3e6b3bf7027ca8399d42cb59e5122e8bd85b2fdf0de5e6932bba68fdb1a8b75cc38b20022f8bf3712ac0ee6ac4525b709a0e24609d634cea83d2571bf57c SHA512 b800a3f1f62a195e515b1ff41aae801f17a983549499c2e694f5ad8690bda1a7218aa7ebcc4908b288ee97c6d335df729348d9a34df4400cfea86d4501af2ba3
-DIST incidenceeditor-18.04.2.tar.xz 526600 BLAKE2B c1b04235ddb89741709278cd3863a18e10eb4e1b0e037e20165f0d161fe2b4920c6a0ad6c966d9758007ab8a9f736fab4368eed55c163485d97c7208fcc71714 SHA512 da0e637419abe1f3993cea94f1827d790bf87c73352942aafb02442d7fa785eb3fdd78cfeb861f5cd1bcd9a5a3abff39fc5355ce4ce23c374d46e84444fc0304
+DIST incidenceeditor-18.04.3.tar.xz 526824 BLAKE2B 17047dd77fb93c39322cf6c9cf3dd5c3e75bf20fc959ab6594fd6d00c6c7be924027bf0c1964c98ab162b109aeebaf8b738598b76b88e860ddfacb76449d24c0 SHA512 805a0eb76d3047e7520d5915b2210c948474028b6692d19ba74ff32553366bf792133c78a5ebb4d50dc9a5506d53cb5837ba7fb9981f30c3d710e6705fa84fa9
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.04.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.04.3.ebuild
similarity index 100%
rename from kde-apps/incidenceeditor/incidenceeditor-18.04.2.ebuild
rename to kde-apps/incidenceeditor/incidenceeditor-18.04.3.ebuild
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 82df96c70463..6047308a00f7 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,2 +1,2 @@
 DIST juk-17.12.3.tar.xz 1868428 BLAKE2B e88f8607aa360751cbbb8c72fe04ad52f1d3f66679515cccf048a3802c65212c66e53936c1826c121ae9dd728ace46dfa5d33978818b8c95d088760e2e0a34ea SHA512 b86e8eb68dca55a9a321cbcfb0172a95a4e1536c3959390f62e3e519862c9de32f327db04e55de39ab194a5e46c228614333b22886b5bb2b4578f0f1d6b5cddc
-DIST juk-18.04.2.tar.xz 1872656 BLAKE2B 3b4c1b2da3cd3faffcaf60d28c4570f570928ebc38e6b380001164d8c039995a576906bddc4ebbc93e332db6e988e4c968c4cfbf63f27e9ca05896ec5608bbff SHA512 8fde81272567f4edd03ffa70f17cbd45b95af2e13517a2025ade98030a71253188b1aecb2d98968ea767bdb1fa39475b0475a617015bf26b1119be20f44698ce
+DIST juk-18.04.3.tar.xz 1872492 BLAKE2B bca7172ddcb8f657d11ee51311b39390c62be31ff996dcdec5557c68f96346b10dddeb9f40d8537a17e4be879861c698b357b6688f3cf2a1220b47108174f778 SHA512 f5492f3edfea4e74f984a1d09d15ec186a96ab536223821795d84f3b5868f45a9b76655121950f69580cd701d1fd6a621e6e4b43a05481c9c05672f02278a35d
diff --git a/kde-apps/juk/juk-18.04.2.ebuild b/kde-apps/juk/juk-18.04.3.ebuild
similarity index 100%
rename from kde-apps/juk/juk-18.04.2.ebuild
rename to kde-apps/juk/juk-18.04.3.ebuild
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index ea904be7f422..d0cfeef911e5 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,2 +1,2 @@
 DIST k3b-17.12.3.tar.xz 10573616 BLAKE2B e5606f7ef96aa34cf2aba068cd7417bd1783910f759dffa2bb4edab3d2e921788513b22839c8e6156f304db4e81b3a6889d1bdf7b4648f64e2cbd383fe032705 SHA512 05cd1413d99f55c4aca5b75cd51691fa0ca0a975660168ee3effa39774deab36d28ef3e7c71860c726d1e7e02b3ac12e6372e2e47bb64d5fa5e21f58540d11e1
-DIST k3b-18.04.2.tar.xz 10595932 BLAKE2B f4ccb715eab5e946e3489b1addc58d300dfbcdf756ec9fecceacf3c3a5c815a3c488b7fc93c6568c165ac0b73a0c621390396d9c5080a39edb65a672f1767b95 SHA512 164279a3af561d361ced962bbbc878edb45e661026c72abfd3098be5b8caf42f0dbb3edebd1920c4ec2e70c8f8b1550e2b95388dbed983734a7560549bab7579
+DIST k3b-18.04.3.tar.xz 10599940 BLAKE2B f5c72ff0ce4fafd15e6c2c954934b7f6e57e8fe31596a0eaa7f0510d919c910882fc8fb5b0d4508a88c43b70d88f22692b34786f9999559be4aa6f334feebcf1 SHA512 744e963537b71d3ac4d529e216a1ece7b858f831e6de5beadcfa42cb690ada80c1d17271080eb5bd753ab3b9325374c382b87449ec9bc816ec32c680b0e7d5ed
diff --git a/kde-apps/k3b/k3b-18.04.2.ebuild b/kde-apps/k3b/k3b-18.04.3.ebuild
similarity index 100%
rename from kde-apps/k3b/k3b-18.04.2.ebuild
rename to kde-apps/k3b/k3b-18.04.3.ebuild
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index bea9f747fcdc..21648a71ced0 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,2 +1,2 @@
 DIST kaccounts-integration-17.12.3.tar.xz 70824 BLAKE2B 1299d25ac8852362a346edecc9f9d6554cd05e5554dcf58b735bce3b099074de4c0b2f8d77566075d90e775bc7e8a6c5cdac2bcb332207d808641163bac5cffa SHA512 239e273496c6d190a5c07f4fb98d718e435d0d4864f2c58877e90824d8f4fbbefcc4a057bc4a1ea25b4df77da9a111711d18a6111a58febe932844befc0489dc
-DIST kaccounts-integration-18.04.2.tar.xz 71660 BLAKE2B 9d1b6a6e5349a8393c8e460a7df20e83d3d482e162feb70a3e136c0c7dbabca84f555505621dc019c5aacffc199235a2d8647075be988a3dd93670e110e9c404 SHA512 3025586b6c9337d9cf7f9faca05e3dd0eb059dc3ae7c41b9b305f70edc5c728b724e3a852ca6f2167542be3e46f6e11283e876b5469606327f19916b8d45c1d8
+DIST kaccounts-integration-18.04.3.tar.xz 71660 BLAKE2B 083248cfd88c7000036351150122bcdb84ca7f340e0a32794a761db3c68f9f18deb8acea86471bbd0402f86846c7e241fd1b8e2c32b668f8f664e6207d592895 SHA512 2b7ff86398f5dfd454be3f8b2792f0abe9ca17cc4cafee9c4f99ad5f4eb63d47a4a7b9a0f43583e1c108d362a5cda52f8428252b0e7f3afef30c67c13b926ba1
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.2.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kaccounts-integration/kaccounts-integration-18.04.2.ebuild
rename to kde-apps/kaccounts-integration/kaccounts-integration-18.04.3.ebuild
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 8556a15f2fab..729c340e178a 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,2 +1,2 @@
 DIST kaccounts-providers-17.12.3.tar.xz 31740 BLAKE2B 5518d40bbb28a7657ec406b76df35faefda9b6e9a3e8a2c31b27806329b66487d54c8a72fae50795bfcde519fbad96059b58466cc62b1197b2f7e4f2bbebfb93 SHA512 c8eba2caaa4cf3e33cf86b8a8713292be9666d3eca75931a493206317735b1938b0d36e028461f16229e26f38039d54d25b7c2e5ccdbfcfe5a68adbea69ee756
-DIST kaccounts-providers-18.04.2.tar.xz 31944 BLAKE2B 05ddb5de8048bc577e13e23a93f0e064db66c65b3cb011bcf6b0ad6c5a94254d8e0616497d55774b07d3a813bb3b367e8a1056f862de900c9f96b7e159c08913 SHA512 8ece11aa955faae7365fdb69f76cdad691da2c3c960036f449334453240485e3dfd273214a9218af9693911674063c9badc93d65bb8ea7b571dfab16932f473e
+DIST kaccounts-providers-18.04.3.tar.xz 31868 BLAKE2B 3538782c5eb9c07607d258f00f11384521a47fb719fefa47bd98a4d7a73f287ccd2a5e65f395eca81652da1f83aa2a192939c48e7be465be5757675db26a7d79 SHA512 9e37745392c58992994989e1a9d35a692f5e08170073d9fa95e911d89ddde75a6bb2954283e46f5d6c6f8ffd9d37e31646e574f67e5f782b65fea331fdf0f28e
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.2.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kaccounts-providers/kaccounts-providers-18.04.2.ebuild
rename to kde-apps/kaccounts-providers/kaccounts-providers-18.04.3.ebuild
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 9decd26f801f..8d5205d5dd34 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1,2 @@
 DIST kaddressbook-17.12.3.tar.xz 544148 BLAKE2B 9857bfaca4f94e6108066d4a6270e6e959b110f5a6ba9219cc371665d36b00d445cef0723ea118c285bee7971a9fb480d8851e4eb569d474de29161f37b90915 SHA512 0b498c7ebf49a6a4df3c24b185ae9edd2d53a80fdc6d84c6ebc6b9f5531766dff579ca7240f6c4657bc113b872811de941e75f7f4d171d3cbd08a0e9afb2a054
-DIST kaddressbook-18.04.2.tar.xz 547860 BLAKE2B 630709b3383a40af33be71bc72f327a680eb04a56452a1491ce0a947495488477c401628b7aa79df04b733d7aad44d19761feaf1169db36733d06fd41e2fc925 SHA512 61ce4e4cfc01374105320eaff80fd7bb9750adfaf029f2f1806ba02499c77a2074a9c840ea59ded04d376a7ad6f1ae59990d017f289a1836859b6229ed533930
+DIST kaddressbook-18.04.3.tar.xz 547988 BLAKE2B 470fc757fbcf30accada18f62916fb21eb2710eddafacbcb6842562238ca74d04ee6b5e1271a1a15d3cc5482bcb9040930f6c1a1185279d784043ccce3395db9 SHA512 5afdfde4319977b31debfe662e2758080f0749229c087179e887272662eb23d69c06b3b634214b240af77b225c91c5b20dae531ea7cd58befa4d019bd28ebcc3
diff --git a/kde-apps/kaddressbook/kaddressbook-18.04.2.ebuild b/kde-apps/kaddressbook/kaddressbook-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kaddressbook/kaddressbook-18.04.2.ebuild
rename to kde-apps/kaddressbook/kaddressbook-18.04.3.ebuild
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 2a8ee23635ae..7cf8e05a0cd9 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,2 +1,2 @@
 DIST kajongg-17.12.3.tar.xz 4238944 BLAKE2B 5b953695413d8486468be2e83d7326199415a1cfe3f2fdba834f0ac3be841042efc73fea11d0c2e0177573065b0576f058e8e3527d7186c02e37986c86bdcb5e SHA512 c1d8a0934952cf11d3de3bc081cc7b33b42a7707cc0cdf91a669087f6707108aa6be25a34a065128afcf63602491096f8533bbcebc8ba89a37f310caab9515b5
-DIST kajongg-18.04.2.tar.xz 4241864 BLAKE2B cab6e62051b5615a86a266d7075f26564c0bfa31a0fc4146456b3bcae4dd5b67d193115ed5735288ec7c3ecb6a6f528cceba95b066c32373f671204e61a05a46 SHA512 d92b897a52f6b0056daa195ffb3e7abf2db60f99f9572ef9bb51a41afe40f518c491fba6dfb1ecaabbf2228d3fe122771e1eb489c04699cab974362cdbc20511
+DIST kajongg-18.04.3.tar.xz 4241892 BLAKE2B 764d0787917948eb70efca211d3fac59beeec0c1fcd4fb5f4ae7f48ce3235cf490a974b268e56ee4032bb4db0e5e6689ab8067c44cb937f70572d25d9019806b SHA512 ba447ed629b40ec8984d95cd324b06637d5d4131e8868dca36ed10451c6bf95e0126e0548322553b5ea15e8ae82211cb3bccade4cd0bd3f19f6ff4a415eca8f3
diff --git a/kde-apps/kajongg/kajongg-18.04.2.ebuild b/kde-apps/kajongg/kajongg-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kajongg/kajongg-18.04.2.ebuild
rename to kde-apps/kajongg/kajongg-18.04.3.ebuild
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 6416041b0252..7b6d6845bad5 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1,2 @@
 DIST kalarm-17.12.3.tar.xz 1797760 BLAKE2B 9ba94eb0dec5b6b9d55fdeac4605ed3ea12668c3d82f530072187b4c5010f8b2d0e4042f7a9b64858a353e7d588afc52186e899479884bf78b2ede7807e61625 SHA512 21f5187fbec15e49b9e51b062b1ee1e424c6dd73cbc9c7871940a8441da5faa15d3344b7adfd1795906907c6ea8b469846f1ad1371d9abfd0e1e4df84daac892
-DIST kalarm-18.04.2.tar.xz 1796312 BLAKE2B 8d9a44b3368686b7655240f46c388a20513ad99fdd02ba6e31080b3ad24360975e9a8a3eefce98b4b8ff04ef7a1a0e10d6d78f5a46501f49d23fe5f2477115c4 SHA512 f6d5165f639f4f2bd2d6f849623c7ca38a60fdac441737631c502c633ec2249d2dc4282d72bf4b46e78164c6324213cac0d9e493d3645346f94a7e38731532f1
+DIST kalarm-18.04.3.tar.xz 1796128 BLAKE2B e4bf35dad7997c7f01f0a2e06efd4dcebe7d8c4493cfed7fdd1d49fd8ba3908925a4395478ecbfa8deee6e3241db057c03935ed2e4b6555b46307c550ab0d82e SHA512 05a524214c1b58db1d8d43d996771d37a1e17bdb9efa3e4e4f7475f1b48a984a2f8e28398a8d3d7cac9a5f7ef109fc82b35941bcd217fe2b6dc1a1de2e7924d6
diff --git a/kde-apps/kalarm/kalarm-18.04.2.ebuild b/kde-apps/kalarm/kalarm-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kalarm/kalarm-18.04.2.ebuild
rename to kde-apps/kalarm/kalarm-18.04.3.ebuild
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 71b80a7a8815..279ca854e6bb 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,2 +1,2 @@
 DIST kalarmcal-17.12.3.tar.xz 494884 BLAKE2B e13c2d013180129eebb497fc26634f53d80cc88b23ea0bba9b5fb775247921e28408ae877651483d803743d531674b4b06ef42c4b33fe87b51978e772714ee80 SHA512 444edd565287441a53da00520bba9b4a22c155048c504a1bd1c0a25f066ae12bea63100589270cd93c26af18cb6e4686c7a753199d10980db638c5a14529239c
-DIST kalarmcal-18.04.2.tar.xz 548360 BLAKE2B e090a7d7a3dc1f23df1d47d46ac841ae73a5df8107f42ab87279adf015aa78b6d95b3f1b15f8e5192e718a992c2f9577982e18df69595bf5c9cf8ea9de31d792 SHA512 dca28d8747d9cb9c24c033813d7a1a3a6f9e51d97d0aea4b2290027742e7d58a571751423d88c760df115de2d9e60c091ff2c9a07ee51680425661836acfbedd
+DIST kalarmcal-18.04.3.tar.xz 548228 BLAKE2B 673a8cb71e1355790864295e3762da3f5c567b08b94b32063a293ce7b156f3a8d6ffc1fb8bf8fdee12d5ee4c3f3c30699f48e563b911f786f4fc4d840f859438 SHA512 d3ff9210cb999d83d108a359e996fcbb187aa0b2bf264331c13f744ac9539a64e678e99b4fac47c19c2edb560c041d07f45450cc3ee56e59c86442755df2c204
diff --git a/kde-apps/kalarmcal/kalarmcal-18.04.2.ebuild b/kde-apps/kalarmcal/kalarmcal-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kalarmcal/kalarmcal-18.04.2.ebuild
rename to kde-apps/kalarmcal/kalarmcal-18.04.3.ebuild
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 57b478f6f4cb..d8c7119b3910 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,2 +1,2 @@
 DIST kalgebra-17.12.3.tar.xz 690480 BLAKE2B 996b66e256d3a87181d03d6fdcd35df9322baef6fa4b6c7a28db8e8641dabf7c33378b632b3a676f983cf25f91377ffc9c98b95553e61805bd1d72ccac958702 SHA512 7062ab6c6a2fce17e313ad16535f51b5ce893384499971dd05e9a256b00e7172b1b83dd3fd4cee76406b32e6abc2a16fa671eb5b95cd8062c760968ede44c62b
-DIST kalgebra-18.04.2.tar.xz 708844 BLAKE2B 56701c62bcb05f5a3d0f91513621284f6e51d5f66bd58e44c5b42490152468b32b6da24db0db0181dc6d864f7ad63462a8635e65f388faa1ed940143e8dd5e56 SHA512 84257ec81e6c0afc87cb5059c8c9f9dc232734f21f488cbc30e4505815238c00489b4a4e2c7dec291454cf3344cea97bd57ff4336e9db258b7599c8be2e10990
+DIST kalgebra-18.04.3.tar.xz 708516 BLAKE2B c3977b66bf126a2e1774401ff1fd4161e9ffb6e82d7cc25b1b43cac4604595f8ebaa2e8ac49ceffc65ee5486a88b4d780edf6196d04e1ee257af38e54787bf8f SHA512 8314e8193a29a611b3566eac8b98e2599e2bfde7ff767a7cf513acf51599e9f42b32f24e8f08bca8e824822260c298f97a64c662882eba1d977ce20ddb92a3f6
diff --git a/kde-apps/kalgebra/kalgebra-18.04.2.ebuild b/kde-apps/kalgebra/kalgebra-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kalgebra/kalgebra-18.04.2.ebuild
rename to kde-apps/kalgebra/kalgebra-18.04.3.ebuild
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 5dcdd90dfb07..77dde548c053 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,2 +1,2 @@
 DIST kalzium-17.12.3.tar.xz 24447404 BLAKE2B 48e99e119bf3bdf38603e6fbe942697fdee28c9decc38aecde525b7d0bd4a3b9f8a8084cd13a238b0eb356ebc179f355783d4937e4317bd25dff138d433ee92f SHA512 989e35f617ef019036571103c1fa4df7fb64238fd2cb7c909798b7baaacb1ebc64d6c989c07040a5c46f3db240edf2e415c11ab4a480eb2f532f1ed992af4fb1
-DIST kalzium-18.04.2.tar.xz 24460432 BLAKE2B f75996e21b5cfafd96f114d7561f583f8d02f15d07f7701007f8820823aaaf1e6eabab86a023d82c6a372125d88fc2bac9e2ffef2625ea5a74db9ce0a1d2a41e SHA512 b22e545fc99dfadff446a72f203bb1b08b9db2e1950511276f1d6bc553132e4b130c62ea326923b870dec08ab145507a68690bcccb0d5121a5526e17540a9298
+DIST kalzium-18.04.3.tar.xz 24391996 BLAKE2B 54ff86420607eae2cfded6722eb5d12c0305fa5f331b1d8a078eaa62e8c82a4b51e253fcc4138123df33839c02d6e86dbb8fc14fe2ef47f5b6efb65a0576e487 SHA512 1a7a6d6dfc8d210fc29bb77de9b1f59cfe45eb774cec4f1783de367c9d67b4d73c83847ea2c99d2706a47e0d5b2c115decd7d3b9b4b1399bf7ca9d4d69a51cc6
diff --git a/kde-apps/kalzium/kalzium-18.04.2.ebuild b/kde-apps/kalzium/kalzium-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kalzium/kalzium-18.04.2.ebuild
rename to kde-apps/kalzium/kalzium-18.04.3.ebuild
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index e7fbcda78b86..b7d6fd5d5e3c 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,2 +1,2 @@
 DIST kamera-17.12.3.tar.xz 96720 BLAKE2B 8f0efe658f007a89fb946be9ead52bf3492f4fdf8684899722c9d6a7273d921b64333e576158ad34c4facb477734b355453ae2379b1fae5db1f11cd5390c6393 SHA512 498ebef75fe32e1ea7a4eb048f6942ab1539db870eecf0550f1f04ab85bbe36543ffa864cd658988110540cc3d8a0ace442c71d00bd9a04497c221bfeba24376
-DIST kamera-18.04.2.tar.xz 97464 BLAKE2B 4925d1e76b0c6a902b32eb5fde12f9e2a7d390e4519ddbe8e08b78a711c5d6e6f7293bdf71415789457d5d3199075501aa9c6bf394218241be66eb740b661545 SHA512 8632558ebbb3fb144c49641fc621ec9c2d2795c9686d6709045070e7d8929862175b7b58d09a7fcb0509e2aa069214a3a29921032bdf2d948ef235c620d77f67
+DIST kamera-18.04.3.tar.xz 97376 BLAKE2B 6368a6f736ce5b8e4af30d5b52f8068e3ada90f6914c6922d9d199f3779dac23884d16887ea29eecbf6187689ebd72f9766cb3d844c0478a475b4650cee97b86 SHA512 f0f85eb94377ab04e2ad8bd973ccdfb4ef5aec6fcaf4046dac021cc466168dcb8c79d8a4da0735dad015bd2a69ff561f243401c7f30ef7b41b2f4fdcc6c80032
diff --git a/kde-apps/kamera/kamera-18.04.2.ebuild b/kde-apps/kamera/kamera-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kamera/kamera-18.04.2.ebuild
rename to kde-apps/kamera/kamera-18.04.3.ebuild
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 1f3886ea903e..4231bdf208d9 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1 +1 @@
-DIST kamoso-18.04.2.tar.xz 185260 BLAKE2B a8830d5eda34e600230574c6587f2b85d66fcc3fbfcfecb10dbeaf34e0a158a9390ccade0f46290835ac5bea23e00ca6dbfca99f64c8e53dcf7386bd508334ef SHA512 b8751766795a8127e0bb80aed88139f2c2c10a5b2211ca29b255178a494689bb61f132e80d01c69d4d837c7e550ce2c11127d3b003e0e630009cb25221d8e369
+DIST kamoso-18.04.3.tar.xz 185160 BLAKE2B e1fcf8299f8839815208c6d12bb5099c29204db48a66932c6ffdb37c3ce8f22da6c3fc8d5b5722f76d6ed38dbc2f64d80d367da318a8645418f9d53d5ed887c3 SHA512 f6f513b4da9d882104f8c8d8ba4f0aa484fa5430be2cab7fa57a8abca4befd5f4f704b46e83b44ae3cba161e309aa0b36e82361cdd0a197fe0d2c6e51101eab3
diff --git a/kde-apps/kamoso/kamoso-18.04.2.ebuild b/kde-apps/kamoso/kamoso-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kamoso/kamoso-18.04.2.ebuild
rename to kde-apps/kamoso/kamoso-18.04.3.ebuild
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index c855c7dfe70e..5d512c45f0b8 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,2 +1,2 @@
 DIST kanagram-17.12.3.tar.xz 7523656 BLAKE2B 3a3cf6ca8e79be66e48f0d9c9e6a9fe311aba098ab0766b2d07ee6c153a77613167c95a2622fd8c42bb5ca30da7c60470fb824322a9c2a10d97f0afc72a6efa7 SHA512 c75df80c167b155c53cbbad66d90a5b01f8f7ad9a97b303decfa3fe9e02ef5f4fb4f890256f6052ab67d735c0c5a1c587d56ea76738889a0c9dc9f24a6b0eab7
-DIST kanagram-18.04.2.tar.xz 7522612 BLAKE2B 77d87ffdba4422a4bb82a34c103ab6e95f2ee0e1c0fcf3ae4f721f2da8fbe42a18a7acafad7fd2ce3f7cbf5adb1203ebfa4e94028978cd6511fad1c70b410a50 SHA512 86600e35f3146fffd156b8043e651c717efb76d5de4b001c0b90a6eb0db1bda1a9ad35cb44d9a1e98e16faadac008dc2435151d3cb6d95f2fabd8c2e8d12f8b8
+DIST kanagram-18.04.3.tar.xz 7431284 BLAKE2B 49704820723996c7326c282cacd14991d8a0bb2b7dd6dddba882b7e3398d359e9cb564328e196a657cfbdf057fa09fc90a5199a6c49ca09e8b70cf97a918aa41 SHA512 a1b65cfecb6274d79fba8fe408d5941e4fbf52a7c5359903416801e246e08083b3a9865a21a570920bfd0e02dc403e36c9f7076a5e66ffda814e1ade4becc8c8
diff --git a/kde-apps/kanagram/kanagram-18.04.2.ebuild b/kde-apps/kanagram/kanagram-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kanagram/kanagram-18.04.2.ebuild
rename to kde-apps/kanagram/kanagram-18.04.3.ebuild
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 3c9bac83f992..72959d8f3f86 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,2 +1,2 @@
 DIST kapman-17.12.3.tar.xz 2525252 BLAKE2B 819e84a0c3c887eb5cfdba86935e174f716fb97a93c0cfb7ca30b13606959e5100fc780d199c1955cc585a505b92b2edb8ecd682de3ca0030613268479e498d9 SHA512 68504b49a9cd41e5093096b24fa8ada843656cedbf4274637aac7f8d0f7d78f35ec35c3502bd5781380cf7ae763f773747193747fe8eb8a7e73a91d97c0af379
-DIST kapman-18.04.2.tar.xz 2525836 BLAKE2B 12dcff2b538924912e0fe3e2643df407883b588f4dc81f1b9ebd2d0f49a6a5783ff6b17cac5f45650b8fdcbc4a9d62f1471779c471246ce63b84eb85318c2179 SHA512 158d66dd947ecdad9de3b17ef7b4a6b7ec1f55bc46fbea5f81b57c818c6ed3c26f0e51d7b81d4fc8dc2450ab0d0f73c620b7df7b02c6dc7d4ef64f3f490fdb8a
+DIST kapman-18.04.3.tar.xz 2525652 BLAKE2B 6b96e74bc70cadec5ea75f9f95b651cf19a3083b7562849606783ca9e034238f45e0662beb59a316821ec5724178ee30b5fa38fc03b416fd3c89001a707c514f SHA512 80f6f2dce23244e4da3cbef019a97323ec4dfd146fb2844001339d096c1137a5b4b51b9d19c72c1ac5a404bde66cedd4bdd43b1df06a5deda0ef4adf8ebf0b5d
diff --git a/kde-apps/kapman/kapman-18.04.2.ebuild b/kde-apps/kapman/kapman-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kapman/kapman-18.04.2.ebuild
rename to kde-apps/kapman/kapman-18.04.3.ebuild
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 8633300b95a5..517497e0f630 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,2 +1,2 @@
 DIST kapptemplate-17.12.3.tar.xz 352488 BLAKE2B 203bfee3e05c42b266f7d7c880149ac31e2f8e37306ae46f2091831b68e80477226c05ace0ba63729e1e258fa504ee91133583e76ffdce0239191f2d4b08c22c SHA512 03eff26877917a38bcae3166a16e6b802cc900513bec9a615c38342f6a1ceeb454fbc195d1e05f3cf3b6f8a9a7a64eeaaa83d07a5058efc42c2140b4a8c9006e
-DIST kapptemplate-18.04.2.tar.xz 352708 BLAKE2B 9d1d88104c964611d521f744d93cac4ab5d969393d622d8818d6d7e50a3d3325ab264a60b1199bad3f0229a0bbb035f886e3137491c4eaeb89230d1065ab613c SHA512 a7df0f5554d57cf0ece5b282c5705a64160443a7a174aa1e62f00e06f1dcd14d2212353b4b444e8dd1fe9195182a1cdbde6a632eccc0ed274aa048a483bf333b
+DIST kapptemplate-18.04.3.tar.xz 316568 BLAKE2B 92bbfeabc7bc3b7d45ab4e805d244404cca8c9a959e27be5e9b5de697bc0f4b8973e12f65198bc675e2977dfa08db07e28304a33b1d786769ac4072a43e2a266 SHA512 35e120bbd5a9dfbfcb9ec9372940ba7420f3e53bf926f2ed77d3facd99343f4edc644bc1ae91a147f73d7a1bcd28730051dc8a1c5990631ceab42113c6c336de
diff --git a/kde-apps/kapptemplate/kapptemplate-18.04.2.ebuild b/kde-apps/kapptemplate/kapptemplate-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kapptemplate/kapptemplate-18.04.2.ebuild
rename to kde-apps/kapptemplate/kapptemplate-18.04.3.ebuild
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 590532f0bb5b..0b4f8bb23fc2 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,2 +1,2 @@
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
-DIST kate-18.04.2.tar.xz 5641048 BLAKE2B 7385aaf26029a6c5b1e749440f41d8ed58e936a06fff9c40ff1b37fd5724298d49d7aa92eb3bdefb2b4088a6cbe106cf6f5796e2a410c2f348c9b42492c7ac7d SHA512 2b3545ba3042f95756f7f3af2d423041107860d390ab6884b52f410adc0a66c8e9fe85e0105935258c0a68daa41c96330ca78de2aa788685daa2b51d97afea7e
+DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
diff --git a/kde-apps/kate/files/kate-18.04.3-root-user.patch b/kde-apps/kate/files/kate-18.04.3-root-user.patch
new file mode 100644
index 000000000000..320c17403595
--- /dev/null
+++ b/kde-apps/kate/files/kate-18.04.3-root-user.patch
@@ -0,0 +1,62 @@
+From bf6d5b7532968763bdc629aa90426c53500af13f Mon Sep 17 00:00:00 2001
+From: Nathaniel Graham <nate@kde.org>
+Date: Sat, 26 May 2018 14:50:24 -0600
+Subject: Re-allow running Kate and KWrite as the actual root user (but still
+ not using sudo)
+
+Summary:
+The original change (9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e) to prevent sudo usage broke the use case of running KWrite or Kate while logged in as the actual `root` user with a GUI session. This is how the Kali distro is set up by default, so the original change amounted to making Kate and KWrite not launch at all on this KDE distro.
+
+This patch re-enables running as the actual root user, but keeps blocking usage via `sudo` or `kdesu`. There are no negative security implications associated with re-allowing usage via the root user, since if you're running a GUI session, you were already exposed to the original security threat and Kate and KWrite do not increase the attack surface.
+
+I have submitted a similar change for Dolphin that has been accepted (D12795), but @elvisangelaccio wants that to go in at the same time as this, to keep them in sync.
+
+BUG: 387973
+FIXED-IN: 18.08.0
+
+Test Plan:
+- Log in as normal user and run `sudo kate` or `sudo kwrite`: you get an error message.
+- Log in as normal user and run `kdesu kate` or `kdesu kwrite`: you get an error message.
+- Log in as the root user and run Kate or KWrite normally: it works.
+
+Reviewers: #kate, dhaumann, cullmann, #ktexteditor
+
+Reviewed By: #kate, dhaumann, #ktexteditor
+
+Subscribers: kwrite-devel, elvisangelaccio
+
+Tags: #kate
+
+Differential Revision: https://phabricator.kde.org/D13138
+---
+ kate/main.cpp   | 14 ++++++++------
+ 2 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/kate/main.cpp b/kate/main.cpp
+index e20fcff..19f7a99 100644
+--- a/kate/main.cpp
++++ b/kate/main.cpp
+@@ -61,13 +61,15 @@
+ int main(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    /**
+-     * Check whether we are running as root
+-     **/
++    // Prohibit using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+-        std::cout << "Executing Kate as root is not possible. To edit files as root use:" << std::endl;
+-        std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl;
+-        return 0;
++        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
++            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
++            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        }
+     }
+ #endif
+     /**
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kate/kate-18.04.2.ebuild b/kde-apps/kate/kate-18.04.2.ebuild
deleted file mode 100644
index df641468f081..000000000000
--- a/kde-apps/kate/kate-18.04.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Kate is an advanced text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+addons"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	addons? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtsql)
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# test hangs
-	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if use addons; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/kate/kate-18.04.3.ebuild b/kde-apps/kate/kate-18.04.3.ebuild
new file mode 100644
index 000000000000..d6665f97c1db
--- /dev/null
+++ b/kde-apps/kate/kate-18.04.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	addons? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kwallet)
+		$(add_frameworks_dep plasma)
+		$(add_frameworks_dep threadweaver)
+		$(add_qt_dep qtsql)
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/ktexteditorpreviewplugin
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	# test hangs
+	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
+	# delete colliding kwrite translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kwrite || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=$(usex addons)
+		-DBUILD_kwrite=FALSE
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if use addons; then
+		elog "The functionality of ktexteditorpreview plugin can be extended with:"
+		elog "  kde-misc/kmarkdownwebview"
+		elog "  media-gfx/kgraphviewer"
+	fi
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 007f7144f3cb..382e5e6331b5 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,2 +1,2 @@
 DIST katomic-17.12.3.tar.xz 1236200 BLAKE2B eb0eb2375fbd272d11e77484029fa66a35915021247e0d30a7312a019b1a59fb092cdddaeea28294b0d84085fe18f24ed06ba140a57c6f70f2b6b7d0dcffbdcb SHA512 7254fec57e9c0fcc2a3bdd3d3fe1a608d09aa80cacb42157b0ceef1af8706a5c0c047b554b0a9cc2a3c098a4d68c07738ea07c23e2516c0e58b405e13df16e1d
-DIST katomic-18.04.2.tar.xz 1237164 BLAKE2B 443fc7ace73826f9a1ca4325084e42561aa625090d5c24c492eaf7f1b9b17b14510951998a0862c779d647be6d42ca5acf27def48ee0324778ceeaaa81d52fc7 SHA512 2cce0fc12e4bb755a0995efe096de6aa9b08a5835e173b75f1bac691a934abfcd4d694ea7c7323227550b3bfc0a980bc2eb7d9152e7cff7fbbe530c031872b3f
+DIST katomic-18.04.3.tar.xz 1237012 BLAKE2B 3880b39d5a2b2a4d87909d7403bb528b5e287ca48250807f937265e03c2a0109e09f5d5881712c70721c7f4751ea0e62dc0ab04c192811fb498d996bc913bf58 SHA512 0aacb62e4c56bdfcb3a861b2ccca8c856d482bc31b89923a20d6a4a0d928bfbe7028553001a897f27742036856b057157b6ae4a226a8adac6ae73baf2a98b1d9
diff --git a/kde-apps/katomic/katomic-18.04.2.ebuild b/kde-apps/katomic/katomic-18.04.3.ebuild
similarity index 100%
rename from kde-apps/katomic/katomic-18.04.2.ebuild
rename to kde-apps/katomic/katomic-18.04.3.ebuild
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 5fa76ff976a3..a5e2824b9e69 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,2 +1,2 @@
 DIST kbackup-1.0.1.tar.xz 471784 BLAKE2B b700df053423d820ee545953b5303b1223c446185b80cbbd19fecb287316cb29156625490166d005231ceae9a068bf2da5b9a599ca8795d16cdcf90454cc8c2e SHA512 1b398a88ce0d109733ad9efd73b3e5770278203a751612749d747352fb05d278a92faeb713fdc82b5cafe9ca1532896a57065b75a9aad1596a34caf4426a18fb
-DIST kbackup-18.04.2.tar.xz 341376 BLAKE2B d126b0e443346e7c53b6f3278841fd309a2f718dd595a8b15f6c33d95cf7d3a431081def56aa8abe1baada62a8b4501b57476a7c0ec229576e6f38d3946e8976 SHA512 e64a8e5cb4e7a243f186e80ca0b07b59f13845af05c622e03ada96d273cf255073691a01858697a19c8d881b50d4f515fe6ed76fe2cbc4620b69116d22642a02
+DIST kbackup-18.04.3.tar.xz 344572 BLAKE2B 704dd6fbf7558205f28f2242c748f20675f6fc58373b4a1ce1d4ebc5b02834cd137c9049142db766473ed84e1deb6e520fa9e2bfacee476ebb5ea74b2e7cb6a8 SHA512 871efe26475248bb25e5b303c36497607d8e33701fde00756db1962975f78ad81903c8176454ddb274692c774f06e8cddf93d35c248372ebc68e5bb0e7c71c08
diff --git a/kde-apps/kbackup/kbackup-18.04.2.ebuild b/kde-apps/kbackup/kbackup-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kbackup/kbackup-18.04.2.ebuild
rename to kde-apps/kbackup/kbackup-18.04.3.ebuild
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index ccd312fc6333..839343437e60 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,2 +1,2 @@
 DIST kblackbox-17.12.3.tar.xz 401756 BLAKE2B 46a6a533271839747e1331f52f6b1b6429b9632bec0473aaf56be90cdb39733257a6ab1f7ddf981c7dc62f4b1e0b3c79aa8a73306c54ead4d4d8f6c303544934 SHA512 e06f251a2b75db0910649e96c0d8ddae449fc23f39d468fc04e56d30b37ce58c3c15483122f40882dcab1ed1791c038caad87131fe2a4c2d140f66e79ed320a9
-DIST kblackbox-18.04.2.tar.xz 404608 BLAKE2B dfdd6d8da35b3eb33bb2ed4988059c92230ce230e50bdc62d2408d8ca968aee111df31148a1870e9093957e6b15a21d022845475da99162fbdb3727fdceba3bd SHA512 dc3041ade230430290126dd58bc53f9106cc36c6f5bfce87360fd6bb90dca9fb0bfee75a7486415ff00efe6476e21af10e6fb658dc1ee79633ac71ae6c8ebfe9
+DIST kblackbox-18.04.3.tar.xz 404564 BLAKE2B 2cdb7412327ecc8fffde975178d8ce3e16e3bc7829c9dfb5705719a1943d8a259085db159ef9c6f2895979d3fa28cc39a1566742bacda1166f171df0b7b71eb8 SHA512 1d29e375de5671f3c9752291d793a5576ccc6acc89996ad6257f1bf54f1982f84047d65e9da7f3c633284092d0c19a883eb389579925b49ec7a1464370eec8c1
diff --git a/kde-apps/kblackbox/kblackbox-18.04.2.ebuild b/kde-apps/kblackbox/kblackbox-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kblackbox/kblackbox-18.04.2.ebuild
rename to kde-apps/kblackbox/kblackbox-18.04.3.ebuild
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index e84ad464a58c..a09a8aa2ead7 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,2 +1,2 @@
 DIST kblocks-17.12.3.tar.xz 1750472 BLAKE2B 60c4390b9b3625ac6ea8c296fa1ed73b46f255fa5d594b7669a27286a73e296e3d49df0ddb39ec4e244eb465538dfec91f03963911b8e06e8aa46bc85c8367b3 SHA512 72e2d278a5707ca423f1494eec0806a0c267b745f14e0c88b9cb97b4fe5a8ae62c8dd0a78f0c94ad9e285d8090be8b45c91bfd0d88cc2a1956d5e580b090de6c
-DIST kblocks-18.04.2.tar.xz 1750420 BLAKE2B 828268cbc9cb57eaef817271911e17763e72d5a0b68575cda7193900b95cf0de3951b3d7f62d75fa308c2d6d1ae110e06ad79168e21deb2c5c2add079401df86 SHA512 a69d0767632e287e6bc5840e57203c2c2321f686197d059d1d8e114d84075ddd0959e68ea69faa93c98a27a80cf489ba5350e9eb987350e9c8165fc11a71e6f4
+DIST kblocks-18.04.3.tar.xz 1750604 BLAKE2B ea372def9f55992980c32b4eda9f938c7ee7e5c6e8416ef99bdd6c752467658afbc2dd065aef2ccef6690a42dccda9bc3360ffa3c33b28feab76b9b1bbb5bcb4 SHA512 6ed96980cfb78ad0ebf62b9742b768e211689acc667120a390be7a0dcc63a4732c9fb4302b594066de4f9e6ecbe3b7b2409a5c4b56dae13bc7a90249de65f48b
diff --git a/kde-apps/kblocks/kblocks-18.04.2.ebuild b/kde-apps/kblocks/kblocks-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kblocks/kblocks-18.04.2.ebuild
rename to kde-apps/kblocks/kblocks-18.04.3.ebuild
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index d3b5775cab32..5d911d6db97a 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,2 +1,2 @@
 DIST kblog-17.12.3.tar.xz 72264 BLAKE2B 36bb90d92b033fcc40f5f899e90b189458b1056c7d3b196d7fe6f0397f98ef5651a1eccbef3294403a27cd37a29ef2d7b45e4be89b752307a3fb2ea011c8db4e SHA512 6e048eed6c247e9af6c96d536fdac371734fc3dfc198094e2cb60218f63347508196ecf9d2d88c190c7e838aa3feb7872001d736be2b7ba01c596f0ca8eea2f9
-DIST kblog-18.04.2.tar.xz 72528 BLAKE2B 7da4f4613c86e19957b74c8d979b1ef46a5a6a6f8002f77332c45743d39fa4aabe0c719fe7b60243684172d2e24fc0cbeabe88b458930e1f6261cc23a43051e2 SHA512 14353655aca0357aa87ac7d2e806e7b037dae0862c7ec7ee7426e5165c429351bfa6e4bed79083c778fcbae8cf1a7708be379f472dd913aa50e01eb796f9c174
+DIST kblog-18.04.3.tar.xz 72472 BLAKE2B e4460ad17033afba4be89f29348d5849d98455f4ab479f626cc59b44243932017ed546b0a3851e4615bb892ab33660018d44d8eff38621b62c6ee66fa36fd136 SHA512 c12df99b010a67a3b653a6a0c79209b37b03195b94df27e2bc805ae939f572df99c29e70a182fcce5aee8c792a7b48446e1e6f032493a420896dd39c207cafae
diff --git a/kde-apps/kblog/kblog-18.04.2.ebuild b/kde-apps/kblog/kblog-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kblog/kblog-18.04.2.ebuild
rename to kde-apps/kblog/kblog-18.04.3.ebuild
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 264c1cb7605b..e759e3f00d01 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,2 +1,2 @@
 DIST kbounce-17.12.3.tar.xz 3484252 BLAKE2B 0d802cd70a1618acaaa6609bec8c58628a149aa6bfed08a33041e11e30feca0902eb17f834f02be632e26b5e210a1b636a41bc22034f3d4059ea622228756bcc SHA512 e9a3a4ea3abc0fb46fe4595e494285006e29f0994841f2effe1b9c7efdbaea4eeea48d74268e0db610e8c8b58e322bf4d4261349e9ce00de7681158850c957b3
-DIST kbounce-18.04.2.tar.xz 3486176 BLAKE2B ab6d67bdb133c0b5f818d428f061dc71fe660be43c0d5275822468a0a8d7468bb5e7b1784bb9263fed919c46842de336b5f5957b4700a6d23255e0a317d04a1a SHA512 f5f22fb75697559133e66adda79d747e6f58a2d398355b333878ff7fa7614ffb2c9a1e74bc7f2d8d69d1fceedcc6fb1e95d5e7aacd0cd9a457816dd6978fab7b
+DIST kbounce-18.04.3.tar.xz 3485332 BLAKE2B 15b329c20f77f6d5dec1a77e0eed8e294c4917fcad4e9415dfc08fca23bef14883068365fb144026f2c6d19bb4d2feab49c533b7a07c0d3434c84b7a67f59bf4 SHA512 73dfa5736780cf06d88125af12141ca5e76342923fb1ad9808998742ea147d6fc6b0d3e7815bdc8bc897671da29d50a749a9278db4dd931c21804fb683d48fe7
diff --git a/kde-apps/kbounce/kbounce-18.04.2.ebuild b/kde-apps/kbounce/kbounce-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kbounce/kbounce-18.04.2.ebuild
rename to kde-apps/kbounce/kbounce-18.04.3.ebuild
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index c4271fd4a082..a8ca2aaaeb66 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,2 +1,2 @@
 DIST kbreakout-17.12.3.tar.xz 2021172 BLAKE2B 839334740acd0c6ac83b2f977044fcfed5c5546250ff96af973a47b7bf323ebb09d2e0feb6e556ec1b6f6bab9f86b81cca97d84f895408dab9652db492bacabd SHA512 8e0927ed28978175dbe9c9e35e2fd2844987b2d556b297a1eb7a31d6ee32508f14f9eb656ebf5ca29ff36dc1007f270e301c41eefb54e34889564e909c122b08
-DIST kbreakout-18.04.2.tar.xz 2023828 BLAKE2B 12ca528efd485c0e684160cb36a39e9b15e9d3afb322e2024f09bb0532f09901ac2faa9123bbd0acb21bdefc0d8da166450ff7c6d76ea5f7fcdef956c1ed5e19 SHA512 f8c1038fe452cf3b8d00844303b9b87a9687d35f05ab7f28dcfcb43f9bbe3073e072298caf358cc9af8388a172c5841e39cfc88d47770daf7415bf3674a6a966
+DIST kbreakout-18.04.3.tar.xz 2023544 BLAKE2B fdab111fbd2364fb135f2e408436f0dbbb25d1ac75e1dd18d199ad72878af047f838b2ec6d267df0c051ed3f239b2b9ea60f4250fdd674f86066efb11d34a424 SHA512 d0296c7a66c7e54c7021bad5624894cd08dc52e6284c102817a43bf6266f5b30165a3c7b1d2f52f23024e6626a83b5e3ac35c4a24b484534f63692a642a1d270
diff --git a/kde-apps/kbreakout/kbreakout-18.04.2.ebuild b/kde-apps/kbreakout/kbreakout-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kbreakout/kbreakout-18.04.2.ebuild
rename to kde-apps/kbreakout/kbreakout-18.04.3.ebuild
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index da4ae5e45df9..ffbaf33faa0d 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,2 +1,2 @@
 DIST kbruch-17.12.3.tar.xz 5601080 BLAKE2B d6fec580f74cd443f63e3e079060314e29b6b8e706f0ac91209b59c1be948c8cae53b03676d6bbbc7ad22981f43fb62c0975c8c64ff663cbd5dce879a60cee5f SHA512 3b3a4ad6e4abebf803feea0b3145290f9ae4cab048b4711138603cf42a1b856a7175b42bcf30388440c63b6c7025733c2e3f286e821c783f700936eeb890340b
-DIST kbruch-18.04.2.tar.xz 5604760 BLAKE2B 611a4fd217a53c79a1cdb3c2083351f03d91f08c81fde3e46e5d02d4fb2c4892242c396767140d3b23b820c471da01f041b927333ca0cc9e2aeedc3cb615eb34 SHA512 680b60f25711879b8e4dbc2aabf076ac6ae573e4ed0407dadca171715bc25d371e8cf9588a1cde5b2e932381041c37aa7422e29d6c9828e3c310b85aa19e1db4
+DIST kbruch-18.04.3.tar.xz 5604504 BLAKE2B d728f78f55abdeb763c30247483ad1df0dba1a7f5293a1fbd50f85ca5f1f75802733309e9ce6b772ca8a888b5ae2f8e39bfcf645317358fdf9bc21e2dae1e147 SHA512 566111d6b097d9b24e98c5911dccf6058b1f7b848a558d004f977fb82d27cbea102f9c84f53ea67a9f006a2537cf76dcd958474474d2cef1480d223552031cc0
diff --git a/kde-apps/kbruch/kbruch-18.04.2.ebuild b/kde-apps/kbruch/kbruch-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kbruch/kbruch-18.04.2.ebuild
rename to kde-apps/kbruch/kbruch-18.04.3.ebuild
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index d6d838dfdcb8..89f38a835a7c 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,2 +1,2 @@
 DIST kcachegrind-17.12.3.tar.xz 813108 BLAKE2B a5768fb9cff28f22750d0cca761ee6201ba6e53ec42e86fada92451b2f43a2c81235ef71cf7484a754c39739b8501f1c8fc31a5da9108c7cf0aebe802662346b SHA512 56f4fee2ba8d03760858bd9d0fd6601e5beb9aec4d8ce2d87ba1d811698f3e8673d12ae834b20696ec98689992b6a560ccae049a5b69538432df6abd21dcfcd6
-DIST kcachegrind-18.04.2.tar.xz 812156 BLAKE2B 842ae20bc4c1fd962e855f0b3ce1a02c3a2681f7f1a641fae5b263d4872997cecf49f37d7e3f1fe97703c734d2a338a66a4901303bad299b6c94c8007650be22 SHA512 7d248d848e406dbf9ecb624d3e083870564b83254f9bdb65423d0a223041605aa9be201e5405a6177e1d39864f23300441f1c48f26101cda7f2ee038201e6800
+DIST kcachegrind-18.04.3.tar.xz 812516 BLAKE2B 48811c28f5f4a08727d04d7220e1696eee93be88404d0e3c18781169c17af03b4a66ac8b26e656d4fcf176d631469cad7586a7c90c2e47124f14f6da670414e8 SHA512 c82fc6fc980c08acaea40c9ada4489b8ff7864cacd0705ac9842723f9a0d93c718951617efc0bca17acf187f7400115c04aace9c5b0fd9275193449d083dd3c2
diff --git a/kde-apps/kcachegrind/kcachegrind-18.04.2.ebuild b/kde-apps/kcachegrind/kcachegrind-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcachegrind/kcachegrind-18.04.2.ebuild
rename to kde-apps/kcachegrind/kcachegrind-18.04.3.ebuild
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 7732698960d0..0d5d6d460814 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,2 +1,2 @@
 DIST kcalc-17.12.3.tar.xz 360180 BLAKE2B 5b48e85c8c5bde7a01510d5f9fbf0f4fc98d7afbacf4574e1f8f21ed0c99df0776ac62de7589a1405473ace3c27a01fc54179e8f59463cbe3f5108f95c60f106 SHA512 e8d86165acfa8f6bce5ec0500baedd16ab73330379675b8b92d64093e8f74b8fbaf2758a269ea522682375c3b30c074194f55e1af96cd6ac758cc08ba68e30e5
-DIST kcalc-18.04.2.tar.xz 362280 BLAKE2B 2daa08685c36411e915b67cb6e5e0dd18e4150d6df2aa4e601bec8cc1f3a47f8fa8f52dc8634b0c81b65987649292cc5a727b6474df4add1cc12981b7d2d02cb SHA512 42093dc86aa1b1f506bf5dde0d96873338b277622b93b8df4e2ab0f991e156b9ca431eac63825203ec2ac33f20bce0bbaee2676f5a6d5e72c74d875f054e77ba
+DIST kcalc-18.04.3.tar.xz 362048 BLAKE2B 4e07d5236bb807705c4fc7617c7422269812187255277046911011b801310034ef1783e90273732e1bdef241d5b4fd024d58e42f5c57218e9797c9b7c9afd6b4 SHA512 372f0e2660836108c405e9aa48a07f042a86ec8c66f43a7ba4a64c5ac1da561b3ead94f7c9e496ec270826813c77e21144b12b720f6a3872a3c49859bb637c83
diff --git a/kde-apps/kcalc/kcalc-18.04.2.ebuild b/kde-apps/kcalc/kcalc-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcalc/kcalc-18.04.2.ebuild
rename to kde-apps/kcalc/kcalc-18.04.3.ebuild
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index e6a823fcc9c0..be18c8438e03 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,2 +1,2 @@
 DIST kcalcore-17.12.3.tar.xz 276504 BLAKE2B e2843a3aadbf6abadeabcc135b03ceb8278b19df960bbe9069ea36068844c13a330a8820a7d4cb7bd0bee98d39ea32efa6828eab95f851eee18bb41146ae8194 SHA512 af4d1accecbb220f4d2090553a1b8eb70b6c941ae0304cf67863c70cf25647a668c65f3371c7ce40533955416cf8ad7381da65982c31848087308249c6ff0968
-DIST kcalcore-18.04.2.tar.xz 252940 BLAKE2B 62d5b5d5c3c5f192d92007ca054bff9bb6a2782c1b0383fac11f3fa9c2bc2473719d99a6e151c7ee975425d976b024ef856de9c440d3b313db20bba2a22335a5 SHA512 1729ea7e6334ab0fe2065ce3b2c71ae45eceb94da8b0dded7602e13bb9ab3921729b356bca33abb10214e9b84a75d7695f2f7a3de80d48cb883bcc5931db4acb
+DIST kcalcore-18.04.3.tar.xz 251228 BLAKE2B d1bef3986badffd3e11b15a52619e653a2e8d1ec05fed6fa4244122493bf9947f542403c0dc167267b0fbca92b7569a08b786c908f8216ce5808aaa16a6fe277 SHA512 2da0993ab1d0c6facbf7f02af186f3554ca38408468dd72f57380817ef1f7f0bf236409a8644d7e84b5019d1eb918f2fd6ff1c1190a89a4e825845659ea84a1b
diff --git a/kde-apps/kcalcore/kcalcore-18.04.2.ebuild b/kde-apps/kcalcore/kcalcore-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcalcore/kcalcore-18.04.2.ebuild
rename to kde-apps/kcalcore/kcalcore-18.04.3.ebuild
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 3bfd4a439005..b592eae70fd7 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,2 +1,2 @@
 DIST kcalutils-17.12.3.tar.xz 323512 BLAKE2B 31ee7f6e9608f496fe3aa3ac59f591ccfdedb421397d36dab0e04aa1cfe21a8e57d6716708dc35d06a32c8053822520c4c2b8b527e725a742de8cdf2b7863aa0 SHA512 68a5cded42a3b2d3cd8eb9f0fa3529b34c270fea06a0861c98bf4d1fd8d9bd239c656c25f5f4cd697b7434458c15b3ba974267161f9b4497020d89345475fae7
-DIST kcalutils-18.04.2.tar.xz 326460 BLAKE2B 7d9ba898ca17b3f9a6c73cb33c17afdd89f657b29279659fe810eb5cde049a60e4d7117bd4f7b5ab98406de27b60700190a55f462dc337926233b98ecec6194e SHA512 c300aa83667de9c1b9fdb3034f7319d3b4c9f09a9987343f71e7419ca4e9d58972a85634546de24436b41f5788b44ccca33f90d0f6cc534776bd66a56e42b4fd
+DIST kcalutils-18.04.3.tar.xz 326484 BLAKE2B 64787af00f304ef03c8bff17fbcd0b861ae061aa3e11fb235d72bcfb7fe60bb407a7299a402cfbd58d1a43db562f8fb3fecc38319bf7ddd5118031fb30d71743 SHA512 8105755af6ee6ff08f072ac58f66ed688bb9c43a6d1947e68234dcbe6e784346b15410fe136d13df822e3ec3f56cef1d1be59dc3ba70a415c1a860f38a0d962a
diff --git a/kde-apps/kcalutils/kcalutils-18.04.2.ebuild b/kde-apps/kcalutils/kcalutils-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcalutils/kcalutils-18.04.2.ebuild
rename to kde-apps/kcalutils/kcalutils-18.04.3.ebuild
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index c2a731a2c190..837310a82004 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,2 +1,2 @@
 DIST kcharselect-17.12.3.tar.xz 351308 BLAKE2B fc9e005381eb83f308c1fa10296f8cb54797cc0f53611cdaa737b6755ad35ba3dcf6a4a69dbdd1531d1dee910f000f62d1ee9bbeb1f3a925920969b33727af56 SHA512 75b4044c55ac539b05306f759bc4241da71500086157cb0847318ea7a9cea8a4fb40580c54d747f3e80a51668c435ca7aec80d68dffb7193e3bcded540b31275
-DIST kcharselect-18.04.2.tar.xz 351900 BLAKE2B 04f4adfdbb927d0d03b5272e31b0899eb74a6b728474a0fe9f69d300c950cc07c1e7e2a815f3253158356e6e889a12f0d72f30d0c9b14b2b0bcbb31947f763a0 SHA512 2ca786d6f74ce813e7d75c14d480820579acea0a9a4000755558fdcb92a74308ce23450cd8301cf37da97f186b162561f2c0af7d87e6c050f8d668ee46a67626
+DIST kcharselect-18.04.3.tar.xz 351764 BLAKE2B f3b9d678e89ad1952077e1e42740c0b36356068e5a1740c4b607acd56d8615329691fc43132ad9359d2a3e820d9e833281b462a66c749be798ac2061b254eba6 SHA512 a0ab55769acb4cfbb33f54d5fbdafc48464c306286321ebd2e8f8b932217d5ae42b0b23c3ca3b40156a4770cb6980b832b2f8ae2dd8e7b6ac81d24c141df5140
diff --git a/kde-apps/kcharselect/kcharselect-18.04.2.ebuild b/kde-apps/kcharselect/kcharselect-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcharselect/kcharselect-18.04.2.ebuild
rename to kde-apps/kcharselect/kcharselect-18.04.3.ebuild
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 80935a9e09e2..1e71ac4cedd0 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,2 +1,2 @@
 DIST kcolorchooser-17.12.3.tar.xz 16716 BLAKE2B 2f1f0f7f00104aa3264949b7c14bf304b7f679baee1bf082c4b478742ac18d04989a97b3dd473d2cfa330b86fec7ca913508e4625c64939a12a83be15bfccdbd SHA512 0016433e5f445842e606ae8f258908cd9911b14867695c1aab4d6ba9c2aae2b3255db4442c108a2561cc32b072085a532ebd6ab94a2ac3af70f382e27d4c451c
-DIST kcolorchooser-18.04.2.tar.xz 16952 BLAKE2B 65dcb6bfa2930de1351240f8d3eea21fc5a94ed320aa76f16706f543a31cc4d80a57b58a7e550a4c4fdebff46018e4ab43aba81879af767d2d3c568a46e19875 SHA512 1fb60a33fe5f93cb65a88445c3f2485e7af7a89d00d8a76a64da58313568bb16b5b412096d1fcb997bf952a2bf925badf2ef8a4b2d216f6920f63593ba1793af
+DIST kcolorchooser-18.04.3.tar.xz 16888 BLAKE2B f39573acb38aeeb609cbfc42d5f8961436bd8aff62eb5b1d8316227cd68a88f30415ef8920016599e5ede291fd543a4af0c955a3dd594d97ed43a01a43296853 SHA512 3adbc920566089bc12e83507dfa25d7215a1811c8adac530a059bbcc5d35dabd8fc122143dd0a238a1e1d586fae18fdf32a24b4685ec044f1fee1c3060d0b667
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.04.2.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcolorchooser/kcolorchooser-18.04.2.ebuild
rename to kde-apps/kcolorchooser/kcolorchooser-18.04.3.ebuild
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 14c4710bcc07..a2ccf56f0166 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,2 +1,2 @@
 DIST kcontacts-17.12.3.tar.xz 206708 BLAKE2B 8c948183fa389be754ee7a8d2928c64f9b854ce06c97fbbca79c784d8e7cd48cade5c2e6a95b3dfe77017f2fcc7bcaebc15c8fb759755b2402a50f4e7dd029e3 SHA512 e6f77cb685d6c163e575862608d127b524815704a4d124234f871aeb36abdbbe6efca26d17c86692094b395e7edf889f53cc70b7c72f33746483c9a04a674e21
-DIST kcontacts-18.04.2.tar.xz 207028 BLAKE2B 30533185229da667d3f2e52acf5995b2406837b3315a65d57ac5e087e3715e3d0a50d2b6a90f2360077bf78e021eeae0a9d8c9d86b95780df4dc196c9ebca9a8 SHA512 7ee83a040189156945ad3f3fdeccc2c66bb3833c015a7668e1f2f0d7158a58c0722b0e154f5d2b9824b140c6f1f613650a0f617b9fcae10f3cd335506d0db027
+DIST kcontacts-18.04.3.tar.xz 206936 BLAKE2B 00df6e8da4a3d70f7d630b8dd671c6214bca8ed7d938aafc2342dbba97337f077cb77bc9d0bab31a91b7b0b8dd9074f667846120e667a52bcb477ec6b29c20d0 SHA512 bf177c4cf0ecbdb71e75ee32a4e71599f864062524f5663e3c1d4b49a06d58a3abf7b18d2840cf7e70248a426fa6b6367375a2aaea211ba15a697e0dbd27953e
diff --git a/kde-apps/kcontacts/kcontacts-18.04.2.ebuild b/kde-apps/kcontacts/kcontacts-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kcontacts/kcontacts-18.04.2.ebuild
rename to kde-apps/kcontacts/kcontacts-18.04.3.ebuild
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 3f757ace293a..b9f7afe8e489 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,2 +1,2 @@
 DIST kcron-17.12.3.tar.xz 1054784 BLAKE2B e9f37357c1a83f7f9fe162ec5f5e0d1289482ff83b77c0f83ff8a592944fb5c133b99709139c12324be1bb1e0b5b87f92fd306e2a1be9eb0a083240803eba9ae SHA512 edc96b2521d86fd288afb688dc7abc60b575bb5171f2ed0026fcee4f9e12966ead95a15aca55e89b672649d83433cab66b6f569e802ecfb680ace86003a36328
-DIST kcron-18.04.2.tar.xz 1056680 BLAKE2B f5995ee7ae28e2478c1d4cb0a13c8c0aca16afb61829eacf6220073c4aa1925557c95e5bc2fe9a4279b418178755f9be05ef7f59644f2dc6b0670b84589ed9b7 SHA512 711f867fe1e82f6018fad6212b422d89fd11fa0b7860f5be55995f8e0425d6895bb8f388c564bf35802582955fd72e4ba3cb6bd2d8d99cf4baff90a29ef53621
+DIST kcron-18.04.3.tar.xz 1056624 BLAKE2B 2d10df38eccaeac408313480527a40eaabfc1d6ae62122c00add9aa03e644cb1a7c15b8ded9bb7027198550b64e7d840ce274d89805ba123fec1b9f9ac79af07 SHA512 3d0b78135c026b64ac9e08f0e963a6c2e54c00d8039b73fc82c9c305eb1bb766bee4ee06b5cda5756a8e8a816c1d8999304c3295ff941f0ef532843d48699141
diff --git a/kde-apps/kcron/kcron-18.04.2.ebuild b/kde-apps/kcron/kcron-18.04.2.ebuild
deleted file mode 100644
index eb1f317ce6db..000000000000
--- a/kde-apps/kcron/kcron-18.04.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!prefix? ( virtual/cron )
-"
diff --git a/kde-apps/kcron/kcron-18.04.3.ebuild b/kde-apps/kcron/kcron-18.04.3.ebuild
new file mode 100644
index 000000000000..42894d06ccc5
--- /dev/null
+++ b/kde-apps/kcron/kcron-18.04.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Task Scheduler"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	virtual/cron
+"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index 23fee6986ff6..c5a640de681d 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,2 +1,2 @@
 DIST kdav-17.12.3.tar.xz 37796 BLAKE2B 3f335f82fd6793d32647d2ab124b349166a7f80aea54d421e57b77f9b68123cde72ed2b8694e4c990303c9e57f73d1fa0a9f367ca2546be267aceec524b4d8e4 SHA512 ae4c28406d9a1cd6e8816ecd693cce1f33c92de8532b29ded33355c417837380bee784608f5784c61d54e77d3bc90e6efcbec9372f64f02131848ee40daba9b6
-DIST kdav-18.04.2.tar.xz 49032 BLAKE2B 1a076eec88077156fd1309a354be74eb435a3c41efb5cc31ca67e94daeb7e0dec18c77a2b4e0d11aaa89fcc5a29f6065c078960228971cb362cba78841b26d8d SHA512 377cb2298962e477a192f7259ec570335ff66778422e3e8db29d41e4ea79b5e234effd4807a27df92f0631d1ccba854d9f4ba7562f0028b0f08d701b377a4666
+DIST kdav-18.04.3.tar.xz 49040 BLAKE2B 2c26e92bc83120f194afa9442322d470302d236730c3d7f3d7ba5e3ba317d3de99cb77e250dd539f1c61d1d2fdf3903da7c6626b9a42eba7d850d648551be0a3 SHA512 5b593fd2345cb0d40dae7732d1e82b8eb84a29a3afe6f3fbddaf4269c2b58cffd5ed34690dae3fe92e59de9979129e567acc1cd41085bac14a42eee81b439363
diff --git a/kde-apps/kdav/kdav-18.04.2.ebuild b/kde-apps/kdav/kdav-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdav/kdav-18.04.2.ebuild
rename to kde-apps/kdav/kdav-18.04.3.ebuild
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kde-apps-meta/kde-apps-meta-18.04.2.ebuild
rename to kde-apps/kde-apps-meta/kde-apps-meta-18.04.3.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index e10e560a2ad9..24bb3b68d55d 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,2 +1,2 @@
 DIST kde-dev-scripts-17.12.3.tar.xz 375796 BLAKE2B 243211c87fe27f298a49107ef48390d30b80bbf904bbeb1a8eb629453f301069e98ca1401a1bc178fc1df98c0ffacf85d253b86077fdeb1ae2c796f1b972c1b0 SHA512 eb55b5016dd4cd50ba8b062496f4f21a8704e48e277c467ef9f9b2e6056afbb6f71e75c9edff84f6e50b0e25b87bcc97f13646cfd6eec892363362d402ee70cb
-DIST kde-dev-scripts-18.04.2.tar.xz 377808 BLAKE2B 46423a37a6b89d741fbdc2845be0f42c2e0bf9093af9f6a58de1c678e61fbc5648b4686662a78115a4ce2eeaa035cfe71b75c5c6d2e3cb7972384ae7a4f22982 SHA512 fc2a8ac778245c787e7ad084a42202230a79db917512882a3dee994602ef3a1f45f67f8af3bd8497481011e37fb5b59ec250a3558401471a0c467ef455b78510
+DIST kde-dev-scripts-18.04.3.tar.xz 377672 BLAKE2B 462e59e9782cb82719354fdfe1133a68aee6b9ae27661eb55fca1b36409b313057c8efc64b6dfe73bd2cfb670990b9abd61cf6d327d4883519a4bca0c1c629fa SHA512 270afbe47f0f03f37acf23046ed1d1c09d25a7b12d8704fab27e5f1c181d42e1609dcb257a28fa55813b1f8ad7196afe67523a188a057bc2e98a080f10b5299c
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.2.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.2.ebuild
rename to kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.3.ebuild
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index ecc8a670b9dd..43c067785125 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,2 +1,2 @@
 DIST kde-dev-utils-17.12.3.tar.xz 61000 BLAKE2B 5bdb7ddfaa792d4a74cc3d55e4c1e110c69af3393421ecbef5871a095097645be566137c2b609ec33c6d13a777e62b388d06f417859af390bfd20e33e406c0c7 SHA512 8f774d33f74eec543772db7a39b18a6a52b4fbade62d5ddad9f632c1719aca58a3a77ceb50bc4f4a96df047c3726c1f37e6e9d21b496cb6a2c082334082ae359
-DIST kde-dev-utils-18.04.2.tar.xz 61388 BLAKE2B 9fb45f3d172d66985aafa619374f855af384a0f7b785bea192960af95b69f39c1e7e6c4eff9dc206e00ebfbfff3232bd3309e601d002f840bf31e5e7c35d60fa SHA512 c72f7573422583d6ae71f35f05c21f9ed6c3bfff650bd371007061c17424f3adab1a1bc5f093fb1d5c51b95c4d0f25979b83a077b1ffec872b613d6bca72d9d2
+DIST kde-dev-utils-18.04.3.tar.xz 61300 BLAKE2B 4c5ca2a6e813146390eb65f6a4e78adf9d70873e8b97458a99786aef1892ba86864280f8e9f4db9b68b28ac17f4297362f85f96eae92294b9835094f069e7bc3 SHA512 585c9d4e7bc426fb758bd352eb1e34091bca3051fd7cd2b29f79f05bacee8804d4a794dab1d4e2329dfc3379b01fb449f406589e4010e1f2d1d065c201f81646
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.2.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kde-dev-utils/kde-dev-utils-18.04.2.ebuild
rename to kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
diff --git a/kde-apps/kde-meta/kde-meta-18.04.2.ebuild b/kde-apps/kde-meta/kde-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kde-meta/kde-meta-18.04.2.ebuild
rename to kde-apps/kde-meta/kde-meta-18.04.3.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.2.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.2.ebuild
rename to kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.3.ebuild
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.2.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.2.ebuild
rename to kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.04.2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdebase-meta/kdebase-meta-18.04.2.ebuild
rename to kde-apps/kdebase-meta/kdebase-meta-18.04.3.ebuild
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 538c0cdd71a6..a88c41c0e074 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,2 +1,2 @@
 DIST kdebugsettings-17.12.3.tar.xz 48668 BLAKE2B 1bba5a7860b47c6cc74e249dbc5b8885ea1721ba5614dbe4246f701c0f759a13efca834298453c17e75bebb1ad9ac155a51d95742b5b428f279bf3090c9a4e89 SHA512 e0f73e18ab1d7bccdb1d4a76a546dfb638f4b0a9ef331a45478fad8e15057a9424bb47d24aee5d870181c00a917ff42ef0e99697ebd3da4319ee8c24aba9264b
-DIST kdebugsettings-18.04.2.tar.xz 51804 BLAKE2B 7b182ffbaadeb2b6684cc13c8c5b9455879427eec18cc2fb4c248ed02e90a6081e665112ed827eeeaec4b675c849852b4ef463b152d95ec3b044f4f836e8aaec SHA512 e80acc63aac2514cbfb1fe017139a3b8a25de44213aa0a30dd297b31887eb24359647966e529b498ce8b3426d8aad9d55cea165d8efc246bc1f0b8c8b87e2725
+DIST kdebugsettings-18.04.3.tar.xz 51832 BLAKE2B 58254c1a12262674e5d2ead5deb414a8060fe19c68dc004d704d72ec57de5f48e91bd878ce7fa827e251eeb768767c615f5b956454a6a98bf7ddf6dceda2fe18 SHA512 582dde5bff461355ba5a2d2173e5a94b129cfa9fd3db6bd70471f1b8f92a0d03df45231c9b69c8c9eec78865b2e45283a3ffb00f2dfd41c88e57003730430023
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.04.2.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdebugsettings/kdebugsettings-18.04.2.ebuild
rename to kde-apps/kdebugsettings/kdebugsettings-18.04.3.ebuild
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.04.2.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdecore-meta/kdecore-meta-18.04.2.ebuild
rename to kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index d79f196ce407..9228ba88074d 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,2 +1,2 @@
 DIST kdeedu-data-17.12.3.tar.xz 327652 BLAKE2B 554de77a50fd6ac954dcdb6081f3ab9631c819150994389977142095defc3f7c802d8a94d8fcf0a2e07df60663d49ae27b75a4420d3ea35013a8c6ddf62ab6e4 SHA512 4f6dc1ed4407bc1447d5a4c66e0ee6e1b2eff69545a46ff365f69ac1e93add84e6415e3e397210112f9850556b52d82ac826dacba501713c4495f1b3669b15de
-DIST kdeedu-data-18.04.2.tar.xz 328076 BLAKE2B db555a3dfcd7d716397cf1f60669d24ab4780163cc26896fa3819dd00af2b110871274b2e5e82bde6c0d952f580b90f871afcdecf2d0684705a072f2e53fdd4f SHA512 579a37b40e0116255769bf4612d02c4e3516fa5bd92ba1afb4aa04da65033f630aff17c1b4e1878bff69b9947b51b5947d7035f0f2709bc834bf27008936e9db
+DIST kdeedu-data-18.04.3.tar.xz 327812 BLAKE2B 7bec203b7f40c6909291a3c31f72b768e46b32a9678106cadfb24c7872670d886c46a85a21c6dc071c009e688012235872c01db9a46d9cfff9c299cbb2763648 SHA512 aec7224798e47c257fd4411a6432689a9a583262a32f875895c6205a276c8af3aa2ee5d57ffcb0b725334a3cef3982d85ad2c61d4b62e6b2f211a7cdfffeda26
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.04.2.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdeedu-data/kdeedu-data-18.04.2.ebuild
rename to kde-apps/kdeedu-data/kdeedu-data-18.04.3.ebuild
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.2.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdeedu-meta/kdeedu-meta-18.04.2.ebuild
rename to kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.04.2.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdegames-meta/kdegames-meta-18.04.2.ebuild
rename to kde-apps/kdegames-meta/kdegames-meta-18.04.3.ebuild
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.2.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.2.ebuild
rename to kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.3.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index a8e56b0871b6..47d095784948 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-mobipocket-17.12.3.tar.xz 13436 BLAKE2B ba45e959dd1f2c807210ac215cad3bfb0270d7bdf4162e2d80560fb4c6d8f6524a2a7da9ff519a6f93a4a937d69b1d1bc8b5fc47d97c3ff900cbf63a73e22adb SHA512 89558644d89bd3c68ab1436adb49698f264c2f59c85646cfbc8dbb2c2364933e74d91d9a24bf266b8ecf2e8852786d21615be1a83d7807e3abf6cd9cef213243
-DIST kdegraphics-mobipocket-18.04.2.tar.xz 13476 BLAKE2B 2a24074154c6504436dab67bb698e75da9cb8cede9eae17db0db9327a55bea719e6f31d9103dd6f2becf88c7fa82604655bc4edeb6f2ea5d16886dfdffcf41fa SHA512 9cb5bcfbf2ab5970427ede9552bb36f512ca5a98d65542777ee60ca5d0b1a5466f3f9a455e81e20db1a848b23121d2a23ca9ea7208de561d4e1c67a53fe85513
+DIST kdegraphics-mobipocket-18.04.3.tar.xz 13476 BLAKE2B 33b49885314b1e531c690a3d9873272b5f73e8cc23fa23524da07a48917f6e08a32f8fb840270941419b7d8ebc36cef28004b8ffc9e034abbaed8d60df1da98f SHA512 e475c7425bd9be50e5e28409ab0661eec7f33945ebb0a1b5fe9ade06c5b14d02b74a7afd572145049d1412a22a5cda12686039bebeecb25ade4eaa54fa307cf2
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.2.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.2.ebuild
rename to kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.3.ebuild
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.2.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.2.ebuild
rename to kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.3.ebuild
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index da6206baa909..c90e61c77fc7 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,2 +1,2 @@
 DIST kdenetwork-filesharing-17.12.3.tar.xz 323564 BLAKE2B 5d1e6b96507e983bb0d30aafc57c59517e6095546de71892e2686d13c96a980af390343a629e5f41426bfaeb010bd52739fb377356fb9854cdf783ece5f01316 SHA512 3152b7ba7eea4a8dd5f4dacfc87cdfb4236d678cf305bebeb915e3f13575d1924ef6418df1d7095ddcea83d17d614370b61738f62631e9696e41a313fcca7457
-DIST kdenetwork-filesharing-18.04.2.tar.xz 324248 BLAKE2B 042f2718aebf6358dd2947ae9b6adc0428bedca0ceaecc4cc1186924ba38b28f51763609c461b0c5fc91805c3675c2bc4bd10ef45400d6d4860f25bdb26099b9 SHA512 0846720e05de6837b4c3c552effc2d72a463406aa35e82b0d7642460856f74faef07765e5731f2587c6b0c40f493e6a429b247869d9b66d2269e01a324a7db30
+DIST kdenetwork-filesharing-18.04.3.tar.xz 324004 BLAKE2B 41470dca8d8a0e9eb092445a5d32c2ef655b9f64e14fcea46b96c848efdcb69471cd184edb321860ae52ad7e222ca81aa8218e5e05d81c523f22834d4910ca9a SHA512 f9672ac750a9b6ae05f0c3b9c3e340966bcacbf906c130ddabae6e7d62f5b67838e5183cc772b676c9a314b866c563d82e079c4e59cdd1339d550a1583a0df5e
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.2.ebuild
rename to kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.3.ebuild
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.2.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.2.ebuild
rename to kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 07dee726f370..780ef3d2b82f 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,2 +1,2 @@
 DIST kdenlive-17.12.3.tar.xz 9383532 BLAKE2B a348cfc3622735af5c37d60f43645062a0bb077e1b10fd780d91ede4d1c6298fe1cad3ce8d6964b33e4b60ad7074ca656199209c827deb2e67da5a71cd341593 SHA512 8142229d01c4c5108bd1482f6479dd7ef7ccb56e19152a74021a47939aedd5841f9161483994f2e8078099b4e3c65a501736938b1ea3233779498f0d8cf5272d
-DIST kdenlive-18.04.2.tar.xz 9398952 BLAKE2B 30cf64dc854f0338ba4f26961c1f77233b5e3dfe65659796067083965e9c23a1d673c2a69dceddc92c99df982b94eb272aa03ab85e5e02e73ab36e583be0f2d2 SHA512 efd895d499db6c799d56adcdf0b7b4b034d46f0319a8fe31541ae1dab800cdac62c2a6133f96c359335cd1cf4828cc860aad7698b3033638bb34f50cf3359014
+DIST kdenlive-18.04.3.tar.xz 9399136 BLAKE2B 0cb0a172ea301695e5e8f1e11aa25cfe8a6a597c61ef2913691fd834f6c9f021a3f63ede54c3a2d13753e06cd0932681246db84831d979a1355faa94418bf37f SHA512 c4f903a2de7a44b743a87068bd54379f12af1ba56f19aa7a5820db58514bd2c973cdfddc05f89232304ba06da9a8e4437138485eff0d611138e21f4f8af4ed77
diff --git a/kde-apps/kdenlive/kdenlive-18.04.2.ebuild b/kde-apps/kdenlive/kdenlive-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdenlive/kdenlive-18.04.2.ebuild
rename to kde-apps/kdenlive/kdenlive-18.04.3.ebuild
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 63800a41cafe..b83344938ea5 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,2 +1,2 @@
 DIST kdepim-addons-17.12.3.tar.xz 2038588 BLAKE2B 76636629c40b81afa4cd6bdf273ea250e196247e2673365dbfb768c76449b01a72ad80af277bb03e31302b4ba8643f5d783b9c05aa62dea8b8eba1effce8a68f SHA512 15e15f5a7a00db274f1ac643d03b41cb71949ad7c36d35c19a011d2704b887dd1f23e78dd6f8ef04852a7934e5e5361fe0a60c93e17b2c891d55baeee75352f2
-DIST kdepim-addons-18.04.2.tar.xz 2510472 BLAKE2B fa34cf0e3e8191e4f305f72a3e293bfe2c3b6b30fda2642c5777230055238abd878a81426f1a922fa92552d08f8e97bc01ab19cd9128c36ac01088fc49f4e819 SHA512 c57c3bbc4d1b47ba6b8c6ff782727c0cf47732a465cb06543a48823ecf77d31594cfe93da396857d46b4f401c70228c27992c055fa35096d043dc58b721d6175
+DIST kdepim-addons-18.04.3.tar.xz 2509988 BLAKE2B e52e24cda18808e177b9192c1c69cb4c8c6b8815ab738b3b1e2127c61fa7cbf6007704a1a243824a0bb66e93336bcaa2590a6a83edca594029fb2087cbb5c20b SHA512 af1659a41a128cd6c822c8de089aa447131817c60636803bb809fe637780e312230633156347cadb11546b7b8bcbcfffd730d6176109dd80ee20e7dcc9a7707b
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.04.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdepim-addons/kdepim-addons-18.04.2.ebuild
rename to kde-apps/kdepim-addons/kdepim-addons-18.04.3.ebuild
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index c0f0e23536c1..c08b053fb85a 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,2 +1,2 @@
 DIST kdepim-apps-libs-17.12.3.tar.xz 72912 BLAKE2B c7988237e127e6b5c79f1488dbab6b2594c16c93570ba5f2dd3f61f477f9a0eff4061417c913eaae20f359037a045c349b960b8252091c180e1aac1cc69725d9 SHA512 ffa2f59f95245ae5f6de56c8bd70a7f7b08cb063917d37aa225ffb7f580460ee951b442b1678151a1cf9ab8fa2fe04a36fcce8fef9773256dd74091337014e50
-DIST kdepim-apps-libs-18.04.2.tar.xz 73240 BLAKE2B 1e12269b6a3e87f5b93d42336bda7587c3a6fab7b26372b2b9e8df8c7398522ed82bc3aa8971849c92e417f232825a46e3466224c7c3916563775529485cd9c8 SHA512 5bf83c792d3a3eb9f77e5a0044d272374b29dfd7505b747db177260d3ff6f38a953515b9042ee455d6f66920163d519b5c6824ea1d3efe1d5e76de5c3ff87aa8
+DIST kdepim-apps-libs-18.04.3.tar.xz 73056 BLAKE2B abc67a5d354ffc4ff45b82d4bfb66f5b7b1327c95ed754768b9944c4f87987feca8c7478db1808251ef5939da5c3a3776f0ef6850b9a7f5e7cf873379b91ffb2 SHA512 1531c1f37540de4d0d8910a7f75eb85d5907495e2d65dfecb1dc83577e58f9587b2b3c37c451d4fe7b968c6f930f96e8cafa3c66fc6931c66e6aa5e41a4a8ab4
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.2.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.2.ebuild
rename to kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.3.ebuild
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdepim-meta/kdepim-meta-18.04.2.ebuild
rename to kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 2333999696dd..866e64073779 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,2 +1,2 @@
 DIST kdepim-runtime-17.12.3.tar.xz 1796892 BLAKE2B 8e74409e6a5eee9201340f971f14324eee68d1510c23f2684686a3e8b8463031cfd6658de2073f1205f8c6f7207d1f1dabbddcfad05c87fa7c8665dd30566bfa SHA512 9ddb7c717a94ca75f561e54f7842c18c2def83c129f004e345a32ab4de4a5b4b15ec50f2044000d785572636a0d78adc4d90f9b3550ed853cf1982c6ef749aa7
-DIST kdepim-runtime-18.04.2.tar.xz 1751204 BLAKE2B 206830dbc56c12924ac6556711d486cc29d83f945582520c4fe9b5b101b788122a56e277ab16bbf7c7d2acd0063749fd2a86c1196e7e2558d6a0033175350c93 SHA512 649a9f9ca2ce0c51a3223ce46a8facb76c6c60447d69648301abf4fb1e5f3b72190812c5f09ee5e4e2faa440680ec661264390238a71c6f1074a03aff3041b1d
+DIST kdepim-runtime-18.04.3.tar.xz 1750516 BLAKE2B 09bbca0580ca2a835d61ab48a004fde691b70d04b03a9da3ccf52abfad16d341e6007ef890d0fda364f679650c6d07e78c2bddd5a4b0dcfb296f24bd0e2c046a SHA512 94770f46d9a100117adf05b03ad75aa3201ae4fc2a6b300bdc3ffc42003e1a54cf8b1275d28c78f32ac764f56e58909dfbc1448b3ab8a9625485d64e8366e68e
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdepim-runtime/kdepim-runtime-18.04.2.ebuild
rename to kde-apps/kdepim-runtime/kdepim-runtime-18.04.3.ebuild
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index b380a1e63660..010ead7f1c93 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,2 +1,2 @@
 DIST kdesdk-kioslaves-17.12.3.tar.xz 37376 BLAKE2B 6d3e5f63ba3aa306df92740cb7e0b3adf46475fbdae8d3994e0682f5c6ce51e16e9c1288d85c9b9f5cb20ffe21af39d3fd99602cc6877b7bea0a2a2efaf72d33 SHA512 c82efe950bb23a8a78e941136a544fd61eaa96421c547b1d68a8b21c265ed69d746fdb14078dde007b96d800aa8b53c629549de01b64733ab830990a65161750
-DIST kdesdk-kioslaves-18.04.2.tar.xz 37496 BLAKE2B 06fe9b4ae9240632057b1f2131546068c847917d5bd59e57cbe352012d6324d71ad244859f5d68c889b30c95f7e8f7b4d58915cd9246218ff42e4b83f8f23161 SHA512 635b4742a11ae45d0715e6206d18ec807b49829fff659773475f601373b77df8b6297a1770350ad2387430336b4a8a6dbd83e264df51af0bdd86e0eb8e274d82
+DIST kdesdk-kioslaves-18.04.3.tar.xz 37460 BLAKE2B 32e1aa9ab46b0eb5697b630488a0bebe0f8ae41e4b52f22960bc60ec140151cd72ba79624bc9c7dd12da5aab5261cc9693818873e8778b9e903b6ce2569de318 SHA512 bce7c3638cc57bd5d0300050d13dad8a3c5508569eea6589023cd9c9fd744f2d24ad0ce52a8fdad59e876a7ab8c9c4856ce61b7d80514175ecf42a7533706038
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.2.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.2.ebuild
rename to kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.3.ebuild
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.2.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdesdk-meta/kdesdk-meta-18.04.2.ebuild
rename to kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 300d3022ef1e..76ef81a99fc2 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,2 +1,2 @@
 DIST kdesdk-thumbnailers-17.12.3.tar.xz 17164 BLAKE2B 5189bcfd5b39d3d91af18b3e0c2be39c9cd889eea6402b8ba98f6d9bbe2ac1b28d30d68ae476e3b26d2a75f29e8f73cc304dbc67cfaaee381afab2ada1564a35 SHA512 4a1aaee48d72601730a5eaffccfcd8f3fc10c848af4c5b72d0a81a41c3012521e43c259fa1fecc83268261290d86cb188c541d06827bb7cb990148257b699c45
-DIST kdesdk-thumbnailers-18.04.2.tar.xz 17216 BLAKE2B 4f1db9fb77da985ec0b376a07e7382a717c6ba494a61b9174ba27ab1fecbfa003778531447a76361a37fdedfa2a94e982257b6c5621fc3b63c9f7efe5c4c8640 SHA512 6e09965f9b22a4fdaa8029767eb86f2a45f3ae749bf1a1823a316b65a92e8c43722282b24d3211feb036eb51573398a04f709d5765745680ea63d052d1260599
+DIST kdesdk-thumbnailers-18.04.3.tar.xz 17140 BLAKE2B 0d25308ec6db0722d971f888fd412677411d223998ba810830e6b20194c055d71f12bbfd48987c1eec677cc00fcdae40db944ec096902250eb087055195d895c SHA512 18e3518fc66fc9d23d49658cfa916ad9080547e0e57899ca66eb4f87874d9e957b0620965464a683912784d6966d8b950f17ea2ac80ec0024e7d7a2c98f509ec
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.2.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.2.ebuild
rename to kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.3.ebuild
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.2.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdeutils-meta/kdeutils-meta-18.04.2.ebuild
rename to kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index c0e995d4b59c..53981a1e434f 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,2 +1,2 @@
 DIST kdf-17.12.3.tar.xz 531168 BLAKE2B 34999ff9c3dabd8f83b3b4e1f197d6587926782ee68cf7df1897316ced417a8a5d6fe83821f9d74f3a2eda95e65c87bedd06822e71c6776c9dbde4705405ea5e SHA512 4a39e1f1d25d73171ba5b299227b9e4e51778d27a544b0198d77217904a5479c9e7107b15514f1ed1b9e2c8418ee3afd134f23c929b796a940a851b104563167
-DIST kdf-18.04.2.tar.xz 531780 BLAKE2B d46fd59d1426a967f70e809f555bb75f4857310e737c054ce8bf79eb59ea2bd2261a9ab1dd4803ea0309f9056198ba7a9aa053abef2ab28707a16fb08fb242d8 SHA512 4eb8b632750cadc6113fb8f9fc6a608290fce168b21a8387777f09e2127e51693333154f17ae72eccfc381e6d50abce39067c18a16d9c254d4d599a003e118a2
+DIST kdf-18.04.3.tar.xz 531604 BLAKE2B 2fb097444f1bc5eb7e7f1a31e3fc33f68f96b4a37d095640719fe734a6cf7e768e66f609395b3aa3c4d1120506da268d60aa6e56fdd4d0ae6bbfa3b95d4d428a SHA512 60d79b85ea9432561dc2cbd9a5f1ccd986fe8bf6fa8d8d0d722ab3e1316013d4044731ed98756441bdf5e56f91bce46d5496bc53863e74c0b5e456b0412cb3fe
diff --git a/kde-apps/kdf/kdf-18.04.2.ebuild b/kde-apps/kdf/kdf-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdf/kdf-18.04.2.ebuild
rename to kde-apps/kdf/kdf-18.04.3.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index edee8dc0db5d..238043de9d6a 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,2 +1,2 @@
 DIST kdialog-17.12.3.tar.xz 95956 BLAKE2B 5a7aee1b13e3163e29f85a98f17fb94e0d4503ad43f4c9a6be82df8bbd64e9ad12de80ebc33248c79c63f27240d192d184e5c9f7d85e458dca22731b5678a599 SHA512 412cff325ff8bc77f91077d5a364f4e900d7344f27a0b13d9319c16c903bf9d7ae79e3687f53167e0157600988ca8c77ef005e37e3fe8d1a0c45c8f776de1e4c
-DIST kdialog-18.04.2.tar.xz 96488 BLAKE2B 10434a6cf2c6ff0d7a72e506d001fd1a5ff5f532545e9edd99715d2432ab194a66d4e831947315ef1704ea17c10bf55bdb023ada13b953f39e7b78263562fe00 SHA512 8e5589a1ca714bc84597f3ebadc91727f314e5834495a8559a19087f41a5cca56e01a9ec594e71708082bb30e4f639397f9b5788d2d4effab9a409b3f03b8f78
+DIST kdialog-18.04.3.tar.xz 96444 BLAKE2B be1a2603dbfe870245ab97f5fcb2c4e59529830a33be9d3fac38bf6e1c1f3c9fc0a6869210a055e89564ba5e8dff46c0ca2c464d6951ac94b4e1bd65bc3b74ce SHA512 a6dc04a0faa75642b919eafc78a67c36a976d98981bb624e39ee6f41e193ca8dd32867e56579caa7f28ae4ce40c32a3191ce357d139df83f13ba2efea74140e6
diff --git a/kde-apps/kdialog/kdialog-18.04.2.ebuild b/kde-apps/kdialog/kdialog-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdialog/kdialog-18.04.2.ebuild
rename to kde-apps/kdialog/kdialog-18.04.3.ebuild
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 2ef5fea93a29..4cf3ad715ecc 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,2 +1,2 @@
 DIST kdiamond-17.12.3.tar.xz 4606848 BLAKE2B ddb65e22deeaf41cdb125ea7dbac51c82a7f7e2528f77e49738261da79d4507f3b61a4261014d16ec5e1507b2317e483bc2e01d2815587ba6629feaa55a16521 SHA512 bcf362489e0e1ace69de17fb33bcf2fe8237565a620f6cb4f6a0ac5563c93c1e7ecdf76e5411463daa7a71225b91c2dd4131b1726566e9ac6b80d49babfd2b4c
-DIST kdiamond-18.04.2.tar.xz 4607796 BLAKE2B 65d1e6f350e59a1eedabdf96ffb44f0226aa016edf1eb1688c543b5e1fca31c8c8777a9b7b8fa088b6005bf76df2031c656b38880433681dd83ac8576f8b8c48 SHA512 82ad3610ca701760a818290624ceffb2f99925139c0161b889a11e17a9b6e11a4ccc157feedc28dc3c22ea22b01a0f3a1a9f11571fa6d0a316308482e1ea594c
+DIST kdiamond-18.04.3.tar.xz 4607668 BLAKE2B 5f0a344297310e7d376730c87750d1d29fbee6d56fa8e2aa3098d14424f66b4a99268ac5a375dbe89e66dc6bd48992eb5d6f373e96673fe51578e2e3b02847e3 SHA512 05798ded8fd034fe4f8829fa1a57ac60b579d8215318ad4707527536cc56d5a0a5634eb7b5634abfab9c070774278efe26ead9a1708f4958690d58c061a4e3bd
diff --git a/kde-apps/kdiamond/kdiamond-18.04.2.ebuild b/kde-apps/kdiamond/kdiamond-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kdiamond/kdiamond-18.04.2.ebuild
rename to kde-apps/kdiamond/kdiamond-18.04.3.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 0769c89a1dcb..e15a62d73a37 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,2 +1,2 @@
 DIST keditbookmarks-17.12.3.tar.xz 183248 BLAKE2B 89c2c23d1d0c9387d38dd84843b9da21cf9fc2d93d58f3b28c1f88bfdcf5c3e35862b7db9e13832cdc72b81a38421ba813bb4b00c21ce6ab2e21421d3a3abdf2 SHA512 9febc64485af7ecc4e2d80d3412a4c6ee8cc6cc38ef4606f31c10bf822389da9318f5e5ac97386bb68f6d4640f4ee5212871bc7c7a2b1a4ffe229936a00c0848
-DIST keditbookmarks-18.04.2.tar.xz 184120 BLAKE2B 9907d155f2feb4585f020bd23f2afb91d41bbee31308df15253b828ca362ca200228e42e0bd19b78e92696135baa7317bde7becadd7db196131d247856e699eb SHA512 9e064154d2536074f408c399480b53720bb399c6fb1a51af7a4be17bdbea2fe319816606a222da37ea57530903445c17a94386bda3d16b96bb6e377bc601da11
+DIST keditbookmarks-18.04.3.tar.xz 183956 BLAKE2B 5baa0c62b32710ccc4047ffe40fddd587c8c2be86e19029410be7d5ea0b6510d929fac32a2e2764527650c2ed3a741ae7a2cf634568da58b7c42994ba3f2d42b SHA512 e9f6b54efbae782ee18ae428cc2c4a797cf95fd92a88c4a8aa610449d6b71864fd226d8e50cb4e3c81309e5048210ace13f55b4a592aa455379aa2f215a7eb55
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.04.2.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.04.3.ebuild
similarity index 100%
rename from kde-apps/keditbookmarks/keditbookmarks-18.04.2.ebuild
rename to kde-apps/keditbookmarks/keditbookmarks-18.04.3.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 604784d9d580..c5142fa98f2a 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,2 +1,2 @@
 DIST kfind-17.12.3.tar.xz 208948 BLAKE2B ac1830df924a8e81fb0756a331e1bec1ed267cc8cf27ac38d2c1c36be8e9293b92505f6446ce0b291871bd0c09e9a3a3399dd63b2d372da7f242d6bb7dc3bbcb SHA512 bc6edb248208f7ef6f609bd3b49cea6c621276dc2e43fec9b4dc28c86f162eb01af6656adc6bd9d90f3b47c92c35470985468c0b166e41a12fac608d77214121
-DIST kfind-18.04.2.tar.xz 210260 BLAKE2B aa761fc672ee7da876729346a35474d7a253d903592c0a8e9d5d30f02f5187be6e0cf8278ae55bbc54057109444d2c95f4f274e96c0222276ea3944b3917a774 SHA512 f8e5224b7447b2402e8d717f7859b0817210910633568227ec9b20e79769c4e4047b265e954294c6a2a054670ba492adf5fb610c115b50ef98461069ca14e678
+DIST kfind-18.04.3.tar.xz 210064 BLAKE2B 1d158d79ebb985ce2ac0e0182c01495a0d94cd7c1964aed86330cf8a992a9a000305021b15509a5bf04fb1de67875aa89dfae12de52656df26106c4328d243b1 SHA512 04e055c67256ad3f25b60ce2aec12f11ab5201e92a5d091d9faed6ef395ac129108cf8108c3cb413ffe45104aa4a1f59fd3e89ad6b32f6f8b4107b52aafefb4b
diff --git a/kde-apps/kfind/kfind-18.04.2.ebuild b/kde-apps/kfind/kfind-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kfind/kfind-18.04.2.ebuild
rename to kde-apps/kfind/kfind-18.04.3.ebuild
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index f1a3604e9313..fcd791cb7c5c 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,2 +1,2 @@
 DIST kfloppy-17.12.3.tar.xz 199060 BLAKE2B add58331fd220c61c7b764e2bc970181b515dc08ddb7b867f41a23d1a70ffc2d8b457ed7a97ef4f49040f048b508e8431478c96db6eb18af990056c934055710 SHA512 1197b15ad8953e037f4fd8463b49da903b56dd5108472b24c9d9e9af22a7c247737650e80c70310d4d906baffb2783e4b911a3645afcd3c69a9acb124a782a16
-DIST kfloppy-18.04.2.tar.xz 199976 BLAKE2B 26ec555a1468ff5a7533a27f5ff360cba39742f874f260865b2d536f42f21cb709aea9a1092d10bd7762714f2c7f25dd44f5a4cbb4bc10fb2fa109428ac969b0 SHA512 032dc6c22c63ae100a530c996c51c94e16085cafc6273dd5bce9b63eed3e44a6b8400ea7296b65733035928eb83d93dc4b82ec6c9544b355798be7ac06fcdb50
+DIST kfloppy-18.04.3.tar.xz 199896 BLAKE2B b71413634da0e4a03d0236573bd973c55edbc10322aa57807c1148138d73f8a121bd481e0e2bb265f871aba9636a6a2b7bb9a249a8e0cde12fdd0c4869fc469b SHA512 4bdc3541bdf3e817840e81b11ab1878d71e96bc7eff2e3fe53d2877b0956588e0ec6cafc41b2661064a676e4e08c0de4c744d97146fee7ae0d3379f6850eb674
diff --git a/kde-apps/kfloppy/kfloppy-18.04.2.ebuild b/kde-apps/kfloppy/kfloppy-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kfloppy/kfloppy-18.04.2.ebuild
rename to kde-apps/kfloppy/kfloppy-18.04.3.ebuild
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index bb0dc25c5493..566ab62a7b2b 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,2 +1,2 @@
 DIST kfourinline-17.12.3.tar.xz 573076 BLAKE2B b7fa506a3e602286b6e5329fd5b091e8165f80104ddf9c6c859e75caaa29257f124c05da82a04e7e8f5ff90ffe5654287a1e10b2f1bbaebde90042b240ce08a3 SHA512 77f9046d477e65aa99a7dd9b4c88b1bf8727e25127b1afdf9872f01d8154bb01e3dd3d8dfe294698dcbc8acdb666f0cfa80bace9893448a5a696485316997005
-DIST kfourinline-18.04.2.tar.xz 573656 BLAKE2B 2ca236166a181862ead00396fc232d136f0e170faac9b054369ad133ba7757ccf3acafc13f79839984756a84d22091bdd1a279e4eaadc0dff3030a1da72749d9 SHA512 c2c42ddabbb8ddf796e442e3fee55a6999647ac0c48af15744dc2a418bdabf3ea4cb0ad3b062db0a729b6ce7fc3d46102f2f4a026eb7589038e34a85044de4e0
+DIST kfourinline-18.04.3.tar.xz 573708 BLAKE2B a6a147ba51b2c788e7dd0009f665909310c0ac9e9b296e6485e80c01cbadba98bc9d86a50057473b75ed54216ac1ec7755a53dd626336996973029ef60984284 SHA512 e7333413bb85ce817ea71dd5b12c3af5eb36147d48f2df9bd87fc83f8b975def60a4dfa17fee8836cd3388d5ac6de189f22cd2d35029764569df9773216f0129
diff --git a/kde-apps/kfourinline/kfourinline-18.04.2.ebuild b/kde-apps/kfourinline/kfourinline-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kfourinline/kfourinline-18.04.2.ebuild
rename to kde-apps/kfourinline/kfourinline-18.04.3.ebuild
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index c88917614883..d180107c74bd 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,2 +1,2 @@
 DIST kgeography-17.12.3.tar.xz 10922256 BLAKE2B fd19344317ced08cebce16caf2f927b6cc8e4059ea6807a0a176ce390d4ce40a9072d06c53454650d77b26f824afe4d1adc89b6c69380258cb9e6208bca57e8e SHA512 de54afe24786535fc90433322cd6bccbbd130e9a1fc162e32dbc2ca2c6ff4a0277be851bce5e6dc722e32f5bea709186a1c6f30eddf0f6a9d403bf5e86b1c1d8
-DIST kgeography-18.04.2.tar.xz 10932792 BLAKE2B 2b2c5b037110815027922a86c6bdd99dcd6a62e36c3fca069427e8e07565eb777d47e317b4e570c202ecaab6b48ef93c4872156aee0bb2ea8d682f213f1dab4c SHA512 cbdd39713037d1cf3c7ab6bae77394f61f75c2e35a392d6704357a0ddc1da906324af1b7776538dbdaa6a7a9141949649c977bee15342e58b8f6941b35259987
+DIST kgeography-18.04.3.tar.xz 10932484 BLAKE2B 1511abc7ade5f212faec31e1ea0afbd134edc9c0757727534a33a51bc29b21328c6bb0973010ac4f1302970e589e87d453cf3dd0c187660eb9919bd27ef1e2cb SHA512 c462a2e3a20fb12bb5583539fbe75d884a4b8f25f018bb3baa15d44054af1c6814d534bb873b66b418927a2009bc3915733828abce8e650c5f3ee752ca3d78d6
diff --git a/kde-apps/kgeography/kgeography-18.04.2.ebuild b/kde-apps/kgeography/kgeography-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kgeography/kgeography-18.04.2.ebuild
rename to kde-apps/kgeography/kgeography-18.04.3.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 9e73d22ce6e6..ecff36cbb02f 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,2 +1,2 @@
 DIST kget-17.12.3.tar.xz 5388864 BLAKE2B def36699a85dcf35166b2466884966acff152a5db16501ecdfd99540c42658f2b63e15024b6f0a891d24fbbb856c19aa8538b42f28fb084e0ce004a4c4f68ef9 SHA512 7f4f12090ed94fa16c71bbfb1e00702fc71b145cf9fed3b3d49197360f2533cdd8f9e442caf3d41e9d1749f94156f48b935e03a9027826def6a3b334af5bdd18
-DIST kget-18.04.2.tar.xz 5214012 BLAKE2B cf6aa5c6a3fdd3710d7b77ffa9247dccf3f3163abf4e322ea894ab662f74e0c6b75cc71b5b67ff379d2d8de81341bd9c588bf03b53389b60fb379a85e5c624c9 SHA512 8d9ff085f3a656cacc995434d689f078117a54472fbf0462d8772112a8fd52edd0bc3d71c064f88331ba2bed1f88e2daef53737ae7fe96eeef795409db40bac8
+DIST kget-18.04.3.tar.xz 5213500 BLAKE2B dc9ef5cd626744cfe2aa505887a6046c7da40f4864e3485945fec3cd36b0ffeac974ad1d55a8986f824ea7a512053e82bcab94e5d5af4e35e221cc78a971d320 SHA512 cefc16a3ecd919a6c288e3adf6b63fff55b8dcbb1517b70ebafebea1045044b28ca490bef91a50dcdcd96091523a0a0b79bb5f3c926f719138de29bb29f50489
diff --git a/kde-apps/kget/kget-18.04.2.ebuild b/kde-apps/kget/kget-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kget/kget-18.04.2.ebuild
rename to kde-apps/kget/kget-18.04.3.ebuild
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 3282246b649d..f05b027afd40 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,2 +1,2 @@
 DIST kgoldrunner-17.12.3.tar.xz 4403404 BLAKE2B e075034c51de901f78c53d1156488ef4f81bf5822217e69ea957c26a83060365f037dd565a83e4eace9a271449ccf06c7da0d8b592162fa1117957cb20422af6 SHA512 b8b0e596270f9f231e79a83eb0597932bfac675e33574320bbee60290973f907f753316e336c111b370a15989fb945fa5ab762d55bc8db64c782a695a8e4eb1f
-DIST kgoldrunner-18.04.2.tar.xz 4405424 BLAKE2B c9b2ffb1e11eeed606afd7b1ed7c2fc85e88b24be16d59901cc79ffc2fb331e4c0318316a5ba3c1e9ce601052599b9c068f5cd2a537b809caf3e086d24029cc0 SHA512 6cc878015c3bcd9f963de230066f249d0f30c7480996290b93411abd0ff1673c04b0f3431a4be719b22c1be877c4ffef6199a1774f1e56f058266c776bc96ec4
+DIST kgoldrunner-18.04.3.tar.xz 4406988 BLAKE2B 9354a0f2abe37b4921b9bbd8c4a496a22a4c8700dcc7acc9927c3660161e1a2eb81dc637aed4ea88bc6ef6205573965069b7ac2a468a1907cb93a1cbca3f1272 SHA512 f920c917322e20fadedfd2b00a93294238f2ea11f7bfcd14110b3feb586958551febc80a729ba5319c77cde08b4e9a68c82df0cf02ee2937472c64c9dc08f482
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.04.2.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kgoldrunner/kgoldrunner-18.04.2.ebuild
rename to kde-apps/kgoldrunner/kgoldrunner-18.04.3.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 45250a9b9be4..97e89da238b5 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,2 +1,2 @@
 DIST kgpg-17.12.3.tar.xz 2817380 BLAKE2B 0ea960f82cbd25a8b0d5bafaaa4ee08f8a70a187c438dc89a113e6f6192e9bc1f70778815257cb2009c117fff698c8d5de87a23feab3c15b798a9a1786cd49b2 SHA512 ff013f675a8a28cd6771683060cbafc12ce2f11fa0bbe400c75483c3eea78311aed6a35c11e799372b79ae6f33d8bfe38410c4faebba6f3c5db693a359cc0cde
-DIST kgpg-18.04.2.tar.xz 2822056 BLAKE2B b543fcd669e4fa81c4191b0b97bdecd62ca3d8b8b53ebef9e677a04963c6583e06e8c8c2dc86cc5edb1e526539fccec831dc5e07ddf23e33815cf0c8ffe09b26 SHA512 04252d0942f1e1f583e81a78ccc1a2b5e2198e1c2a32ca72477b9b805e6817419cfe42be168daf39ee80c96f7504a9fd48c1268b81eaff5753d1bd8542b5a766
+DIST kgpg-18.04.3.tar.xz 2822520 BLAKE2B 8ee556bd1ece83cae3b53e8dd2769a3805b7634dc4db9fbe02a51021938c1ff294daeed6d494f40d40c82ff43ea5f2c3d679b2fbbd980b60ebf9daf83f60e50b SHA512 e799244dd28b26cd5738cdc03a07c563eef94a92304d4e045441f9c3104cd37addb240ed2ab1a42b576746b9c02e694111e4a4de8f01da61f95ea940ac69e74c
diff --git a/kde-apps/kgpg/kgpg-18.04.2.ebuild b/kde-apps/kgpg/kgpg-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kgpg/kgpg-18.04.2.ebuild
rename to kde-apps/kgpg/kgpg-18.04.3.ebuild
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 431eb7c59389..5fe3f3d6c3f0 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,2 +1,2 @@
 DIST khangman-17.12.3.tar.xz 6456648 BLAKE2B 48bd56b9bebbc2f91715c5b1d33b9f3c32908a8fced9f609c37a0f91cd431d9bb6dd5afd5cf452074662c3fe0f7b1017809918b4f2f00fbab94a447edf6f8016 SHA512 9b2759a272089422e1929854cfa584c356e3b69a6f58a26d3f610961cf36d581f06b41e173e19783c80cca4d9adb0f239a98316dcf36f82ecc17fc829d0aa5dd
-DIST khangman-18.04.2.tar.xz 6463248 BLAKE2B d29d0a69bab07ed7daa9dff21f2dec346c3449b8f182dc90b3ea37917fdc0dbe144e562a22b76e4f06b0d4bb188afe5cc3e2642930d108a931f87d320e0b2d15 SHA512 015a7f6cba833d38b4bf244e36c03e53476cb1426fe74fd88d8cfcae17aafed08c9bcdb2445e2d57a2d7eb73de519f5ff79b2427b35fa68307ad3aa2a860c684
+DIST khangman-18.04.3.tar.xz 7271792 BLAKE2B 1681d7ed248be16ef903814c0d5c1a9c6bd83aaa2ebcd82e2c03b5a98e4f5148b880453c622c76db49d3240891d78e2e1c2512ac191af446e40e68d5db8742fa SHA512 6df84c260f72f925e272f1977bd8b6552ce23b27402e88ac7640cdd4e6a89ef79cae928b11c26c17775c70e424d1934dd7961f2a7f41bb894d9aebd5d950edca
diff --git a/kde-apps/khangman/khangman-18.04.2.ebuild b/kde-apps/khangman/khangman-18.04.3.ebuild
similarity index 100%
rename from kde-apps/khangman/khangman-18.04.2.ebuild
rename to kde-apps/khangman/khangman-18.04.3.ebuild
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index d7593fb253ed..f222bc44f6b1 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,2 +1,2 @@
 DIST khelpcenter-17.12.3.tar.xz 3024356 BLAKE2B 97f0ada4b68485204d0a239932a581c3e89312d5e0f5d991d35983e17ddb65331660e8a4d134594880989c17d36ad3a2b21a9ff327fc171aec7fbfe57e0489f2 SHA512 32febc1984c44112c22877e05742c6e7bbf0933ada1708305687fb6147e9bf3e06141cb2e88d8d3a4fe6442d983a56d4dd0e813f05e8ddb8b7083826575bf40d
-DIST khelpcenter-18.04.2.tar.xz 3828152 BLAKE2B 5fc88e22a8858471fb29a2c70ecf5b68e7177fa18c818d9a07cf186909107f1d149850a4e47ee631905e2fee5783fccd722fa4b85b3575c1b95d58a0dc77138e SHA512 0855c7ccbc7e78e1c90185d767faeaeb08497bbb1a958e33874e08076d927fd0b4ebd3ef19395c908cbdd062db3e7052bc170d63e7e003b44acb2cf6063eaed0
+DIST khelpcenter-18.04.3.tar.xz 3831256 BLAKE2B fb770d49fa3c98270a41413160a2122caa68a4db796bf722827989973cad5b7779d0a2b008fe1e72dcdd96f6dad2585f5e16602b48799acb3b833aba29c0bdda SHA512 4727de8223af52a9c269d47e59b4de3f7f30a1d06b85cdc71300a6c83eb49ddcc2f32c33db8a9ea7d8d961da6d20550dcf49400df6431fa91c7ec5a2b676dd63
diff --git a/kde-apps/khelpcenter/khelpcenter-18.04.2.ebuild b/kde-apps/khelpcenter/khelpcenter-18.04.3.ebuild
similarity index 100%
rename from kde-apps/khelpcenter/khelpcenter-18.04.2.ebuild
rename to kde-apps/khelpcenter/khelpcenter-18.04.3.ebuild
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 0d957cdac275..381c55a4be45 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,2 +1,2 @@
 DIST kidentitymanagement-17.12.3.tar.xz 147912 BLAKE2B 84c2252caaa7b30145910fc6012018e325ea5013dbe5f780504a181d067ff3279520a0e64385861130e6eaa350bf44edf14890e01bd17621026393eeb7ad98c3 SHA512 3ab1f0ebe6f993a5c1d8bc6b4952f7ab99150ec9938d4599c3b15451880089f385fe4775a950bcd948ca0926082038c47ddd3dd1f3ca5e9dfcd625f4934a66ea
-DIST kidentitymanagement-18.04.2.tar.xz 148228 BLAKE2B 4e10ab52f3f3cdf703eae48ff7365b5d04d346ff81c88001504d8dbf8b9c04d895dbbaa3d56732001777e8dc04d1e3ad01f1eee8750b2a683a3bcb4c953351b7 SHA512 2622656bab7c3944baaf88443ff74b3dbb018acc9c648f31b13a5c7b9f398a37e8609a3b9af5e548052d80de331a1d3e852f2880a6a8147df3c1d77fa47fdac5
+DIST kidentitymanagement-18.04.3.tar.xz 148148 BLAKE2B 17cf0a0e449c99cfce153f29f5dd5cb8db5769250f4a5cb70fc2c84e6d644fdd7f18721bc55256c357221e54460361f1e1ebf19890ac38f01392d56ced7a8663 SHA512 4e6ad309d18e2bb88a86a1b236bb29782aede0ca18cc5e4ac76926e17030ec6367d80fda50dab4c29fcf5a4475560e027edbb7cc9cdedf2c3d6f9dba7ff6697b
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kidentitymanagement/kidentitymanagement-18.04.2.ebuild
rename to kde-apps/kidentitymanagement/kidentitymanagement-18.04.3.ebuild
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 58633c6faa78..ccf00488d95f 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,2 +1,2 @@
 DIST kig-17.12.3.tar.xz 3589648 BLAKE2B ebe02b35f3244d3e9f262dace700f194b8083f0f3f996c12b466ae1f722085205bc39e8a743ed201f5e41c5b201cc512c2b5700f6c2a11d3c596479c718f9b2a SHA512 bf6201c74627e3892a584c455875f6aeabf466aa092ff35255423e152ca59b9b4d364281c740ba5f65ec3b6a208628ed229368c223193c28ae0c7fa6a21aee36
-DIST kig-18.04.2.tar.xz 3592260 BLAKE2B 52e6f5a8b4331553a0bfb849207fcccd32444919019cc9ef7b03e956d43e2f9d2c765fac18d6c7eed84d48882a104dc2cf58d835ebde2663199ee5b331992876 SHA512 6de1d50baff032f46cda8440e344556176bfa356353c08ca26a632afe1e73c3fafca034cf29519d6c537c5d42f1e43f377ae114c022f209bff371599267d7d49
+DIST kig-18.04.3.tar.xz 3591984 BLAKE2B 6ac5285f4e9a0fe97a19886a44874f352e96688d0fd2c81bc9ea8119570939654b5eb26f1c874eaa05894d7518b5b199f42093939d20baad898af2d802f55665 SHA512 cb015a7d675cf0854c8f911fe0f9868c3a55c844af9f4337a0ebb67ce14f75146fe86a03248cdb0c7f361dba61d58276d0893fa06b355f26a85faf48423ce377
diff --git a/kde-apps/kig/kig-18.04.2.ebuild b/kde-apps/kig/kig-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kig/kig-18.04.2.ebuild
rename to kde-apps/kig/kig-18.04.3.ebuild
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index c001d62d19a2..d3240b0ef626 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,2 +1,2 @@
 DIST kigo-17.12.3.tar.xz 5222512 BLAKE2B 24fa500c8b5b973fdaf266f710c120a824e7e7832c1d973f915c745cfa5a6528dbfa4c3fb0b62fd80520b6ce8b8da1149c1b24438c11c679bb08718ba34ef9a9 SHA512 23e998bf600b7cd97b92ad5d327448b5190885c1470286e0c1c76755b5cd4d278806010854ea98b7ac71ba6776b6748895f62f4c9c309adae44a97c5c9295112
-DIST kigo-18.04.2.tar.xz 5224476 BLAKE2B 8c0f2d501410f21834df35d4a5fde2369b07df86117f962ca321149469b3088ef5d595af7f1b6c2e89ccff4d56168cab772f9e04c48d6d54ed98e4a921d62453 SHA512 e57c6acc2eb39e5c45a368a9b026faf67e73de7d01d75877ae22a6aa654efec7594a36952eff92bb63fa4510a825f24f129143c272407f5ce23a837e1858a70a
+DIST kigo-18.04.3.tar.xz 5224404 BLAKE2B 32285e811a899cad93ab05ef08b00336d13d04fa1371cdf994ca9ddfbe1a87d2328b9544f5090afcb9d1a720637281b362d722496cf6388cc48a44573edc78d8 SHA512 3e42114294c633985ba527390bf24404086fd5fa0a03f714201af1a93c2e16a6b325b10eaa5459aa11d4f11fb69a88f3fa40c8bf3a0535ae44ad6ce408591c7a
diff --git a/kde-apps/kigo/kigo-18.04.2.ebuild b/kde-apps/kigo/kigo-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kigo/kigo-18.04.2.ebuild
rename to kde-apps/kigo/kigo-18.04.3.ebuild
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index ec4f0868878e..f6b876c27fb0 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,2 +1,2 @@
 DIST killbots-17.12.3.tar.xz 1166204 BLAKE2B 418c9e86420e9d8b7014e949f2afd910503e9cd90bca71034af1f99c26f5a2bbc339e36c1c46df091a088a71c23a1294dd04cd31c600ebbc9c1fc31050148686 SHA512 327229cdc3f2dfffbc3cafa152b899081d66e0fd7560251c948cbca0bf961bfb4df16e3cf7eacef281278441a4eaa58985197942d653980d6f3ed82e754b7cc7
-DIST killbots-18.04.2.tar.xz 1165280 BLAKE2B 266d174c227848f347b87320391f14b5ead04da4f4aa152c996d7ab23bc0b08efd47ea382ccf72414eba8f3653f1fcabbe80b54f2e36ae1720d92c2537a7620e SHA512 5a347e762eaec32bbe73f78233ce438d8589a96cc5cf48008fb0353ef9e98f6ea2ad0917fe5d5e46588fc7522cd2ddf3676bae73caa6d3eda62ac26ecfa937bd
+DIST killbots-18.04.3.tar.xz 1165284 BLAKE2B 5d8e7aff2fc2cf670693c1985217277d33d88bc7c9550dcc08fbc9503da218d4551c665da7cf4c914885155f6f1285aac7b9180b5fb677f27d7dad3739a1d705 SHA512 b14103edecedc5b3b8602c56b0291d4a2cb73805098f2380c48dd010b1363901a36adaea3b655d474cb379679932060696cd7dcb3a0cf5d91531778980f9fad3
diff --git a/kde-apps/killbots/killbots-18.04.2.ebuild b/kde-apps/killbots/killbots-18.04.3.ebuild
similarity index 100%
rename from kde-apps/killbots/killbots-18.04.2.ebuild
rename to kde-apps/killbots/killbots-18.04.3.ebuild
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 78a31145043b..472027ca1fab 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,2 +1,2 @@
 DIST kimagemapeditor-17.12.3.tar.xz 1053900 BLAKE2B 07606cc923bf586027111797822f61c4a9bb04bb26216e52e7970ace5a6729f2b2493b2c89cc1a8945ef3955273b7684ce085cb2268f917873a682343b1ac9e0 SHA512 5a8922131f5847bca4100ced10d8b02e4d0b641f14afa0df7162ac71682bc19bed499515df57e40ce61f1c30bb3593e8c68ee5c650d60e9e62d390a10dd12bbf
-DIST kimagemapeditor-18.04.2.tar.xz 1056192 BLAKE2B 7d572475307e8d1d5a617093201ed2e6503c199fb88dcd27eab1a27881f06fc23451e6bfe0bf60b4d1278545751987ca2dc3c2670558841d788e3e65f9b9e5fe SHA512 579944dab65a623dd05247d1b46f76b48013992bf5d1ca2f2804f288352123f5d9efd700ffcec1749428f5b1a14d8f950dbf36b5898a72b8794b784eef9111bc
+DIST kimagemapeditor-18.04.3.tar.xz 1056724 BLAKE2B 8391d25f9621b91e17fe7cc251a5f1b3a43b56102acc9b9b1e34dc709e589d7b43b111563bf5d864f33490f3f64e903c3d8e8673a41e33cfc7136e1c04d5b9cc SHA512 ac9e491a8557be0e28fcd2f01fe3a7621043ad343acaf6ab68524fe1cdc1733d55c8e63ab44145b7aaf8feb39d77cf9fdd68549e39f512965342418bde7be872
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.2.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kimagemapeditor/kimagemapeditor-18.04.2.ebuild
rename to kde-apps/kimagemapeditor/kimagemapeditor-18.04.3.ebuild
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 6d4643657db3..f096fe063475 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,2 +1,2 @@
 DIST kimap-17.12.3.tar.xz 119720 BLAKE2B 49bc60c94804735468f491f6d50308f580cff8a7f19f95cbb0e2168a6c357783ecc1efbef3eab6a8dc5f841bb5166116690e2542fab51dbfb86f4e8b94569a03 SHA512 588a681bca53d4a0b961ba6670007c1d507c6622db1e3c058ec20b1bdaefb603fb6d071931ac988916b0686d3a020a86aaf96ddb29f1e75355f53090b79aabc5
-DIST kimap-18.04.2.tar.xz 119184 BLAKE2B 503bb58af9864d1ab0f5a10adb11c05ca4b85f89a1b564112a4da5ad00a8c7b8dd018cf5e837b0cd50dca8ec9bfd9463a13553b570336b6901a8bfea8c2ec9d5 SHA512 57f83df874e816b07624d6f6107882ba8bbbff1e521810543ee6bc764f2e5a27c12bce65cdad2b5cf8871376cf55f27ba5f37aacde81c4be2f083abcc8f03379
+DIST kimap-18.04.3.tar.xz 119332 BLAKE2B f235a3ffc973bdf3ca27eba494b279c4ae2cc9b5eec8bc2b8597667fdc3e2d2fc4f9c97a0437001a13c770f498480e0945f85aedd0f9c00b20aa4b027650dd02 SHA512 a17e4132a3c0d698eda715fa7ebcc5d7d4e16b9ad8aefab25bc3d91a64200504fdfcf034d42929f56c0b26ee90ad8b068e58b7bac1d2a3934ae5757de4c3b966
diff --git a/kde-apps/kimap/kimap-18.04.2.ebuild b/kde-apps/kimap/kimap-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kimap/kimap-18.04.2.ebuild
rename to kde-apps/kimap/kimap-18.04.3.ebuild
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 7adf00abeab6..a8a9057c0352 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,2 +1,2 @@
 DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697efec49b9841b272bc9574aca897bbf104644ea303f11749161c68543206407c26174141ae31c43ca6b403c7d39c179 SHA512 a7d13516646954a00b03d1284c6d93ae71ec9598d03e3f500a6449160c228be9e41aa2351b71522423960e5321cc3a30a46ac6d2ba9e8dbad043def2804b57d5
-DIST kio-extras-18.04.2.tar.xz 550488 BLAKE2B 21b6be4cbe060ddee3dc05b7ae15a426fd69db4b17d178a4aa1392feb349427c26ee7aa16d5fbf85ddac95beff143e0be02727df8018e84fc0602999f711993e SHA512 122dbb68740e80af346dc4ca01f53ee6bf267c9d2c0e2f09c04999d3b2aba69586c9ca446b3b5426160571c4b64b6a09452aa46e9451e3de12c20db6bf654251
+DIST kio-extras-18.04.3.tar.xz 549840 BLAKE2B 7bb03f01fff6930d5b7bc4cdd01e960239d55ede4feb4eeb131db75515763cf924b288811cd99a5d89a79059f2cd5241e872b990799c758431f13f1440eef424 SHA512 49ab5ad8d74831a9ef1636e46abc76d66d3ef7d9e8f1ce793eb8d5c37f9e7ee4205c9643339f5c46657d4f537572e3f8a180ebace8599a1dfcbf8d27470b2f0b
diff --git a/kde-apps/kio-extras/files/kio-extras-18.04.2-fix-sftp-links.patch b/kde-apps/kio-extras/files/kio-extras-18.04.2-fix-sftp-links.patch
deleted file mode 100644
index 8f7c02338794..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-18.04.2-fix-sftp-links.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From bca40518682a038aa08823fbbfb2cc4b9ef63802 Mon Sep 17 00:00:00 2001
-From: Jaime Torres <jtamate@gmail.com>
-Date: Wed, 13 Jun 2018 19:21:34 +0200
-Subject: fix sftp links with new uds implementation
-
-Summary:
-When listening a directory with links in sftp, the type of the entry of a symlink was inserted twice.
-Now the entry data is inserted only once.
-Get rid of the goto statement using local variables.
-
-Test Plan: Tested in sftp://127.0.0.1 with broken symbolic links and sftp://127.0.0.1/usr/lib64 with a lot of symbolic links.
-
-Reviewers: dfaure, martinkostolny, asturmlechner, lbeltrame, bruns
-
-Reviewed By: dfaure, martinkostolny
-
-Differential Revision: https://phabricator.kde.org/D13475
----
- sftp/kio_sftp.cpp | 129 ++++++++++++++++++++++++++++--------------------------
- 1 file changed, 67 insertions(+), 62 deletions(-)
-
-diff --git a/sftp/kio_sftp.cpp b/sftp/kio_sftp.cpp
-index 0a82365..f515458 100644
---- a/sftp/kio_sftp.cpp
-+++ b/sftp/kio_sftp.cpp
-@@ -342,6 +342,9 @@ bool sftpProtocol::createUDSEntry(const QString &filename, const QByteArray &pat
-   mode_t type;
-   mode_t access;
-   char *link;
-+  bool isBrokenLink = false;
-+  long long fileType = S_IFREG;
-+  long long size = 0LL;
- 
-   Q_ASSERT(entry.count() == 0);
- 
-@@ -353,54 +356,53 @@ bool sftpProtocol::createUDSEntry(const QString &filename, const QByteArray &pat
-   entry.insert(KIO::UDSEntry::UDS_NAME, filename);
- 
-   if (sb->type == SSH_FILEXFER_TYPE_SYMLINK) {
--    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG);
-     link = sftp_readlink(mSftp, path.constData());
-     if (link == nullptr) {
-       sftp_attributes_free(sb);
-       return false;
-     }
-     entry.insert(KIO::UDSEntry::UDS_LINK_DEST, QFile::decodeName(link));
--    delete link;
-+    free(link);
-     // A symlink -> follow it only if details > 1
-     if (details > 1) {
-       sftp_attributes sb2 = sftp_stat(mSftp, path.constData());
-       if (sb2 == nullptr) {
--        // It is a link pointing to nowhere
--        type = S_IFMT - 1;
--        access = S_IRWXU | S_IRWXG | S_IRWXO;
--        entry.insert( KIO::UDSEntry::UDS_FILE_TYPE, type);
--        entry.insert( KIO::UDSEntry::UDS_ACCESS, access);
--        entry.insert( KIO::UDSEntry::UDS_SIZE, 0LL );
--
--        goto notype;
-+        isBrokenLink = true;
-+      } else {
-+         sftp_attributes_free(sb);
-+         sb = sb2;
-       }
--      sftp_attributes_free(sb);
--      sb = sb2;
-     }
-   }
- 
--  switch (sb->type) {
--    case SSH_FILEXFER_TYPE_REGULAR:
--      entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG);
--      break;
--    case SSH_FILEXFER_TYPE_DIRECTORY:
--      entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
--      break;
--    case SSH_FILEXFER_TYPE_SYMLINK:
--      entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFLNK);
--      break;
--    case SSH_FILEXFER_TYPE_SPECIAL:
--    case SSH_FILEXFER_TYPE_UNKNOWN:
--      entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFMT - 1);
--      break;
-+  if (isBrokenLink) {
-+    // It is a link pointing to nowhere
-+    fileType = S_IFMT - 1;
-+    access = S_IRWXU | S_IRWXG | S_IRWXO;
-+    size = 0LL;
-+  } else {
-+    switch (sb->type) {
-+      case SSH_FILEXFER_TYPE_REGULAR:
-+        fileType = S_IFREG;
-+        break;
-+      case SSH_FILEXFER_TYPE_DIRECTORY:
-+        fileType = S_IFDIR;
-+        break;
-+      case SSH_FILEXFER_TYPE_SYMLINK:
-+        fileType = S_IFLNK;
-+        break;
-+      case SSH_FILEXFER_TYPE_SPECIAL:
-+      case SSH_FILEXFER_TYPE_UNKNOWN:
-+        fileType = S_IFMT - 1;
-+        break;
-+    }
-+    access = sb->permissions & 07777;
-+    size = sb->size;
-   }
--
--  access = sb->permissions & 07777;
-+  entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, fileType);
-   entry.insert(KIO::UDSEntry::UDS_ACCESS, access);
-+  entry.insert( KIO::UDSEntry::UDS_SIZE, size);
- 
--  entry.insert(KIO::UDSEntry::UDS_SIZE, sb->size);
--
--notype:
-   if (details > 0) {
-     if (sb->owner) {
-       entry.insert(KIO::UDSEntry::UDS_USER, QString::fromUtf8(sb->owner));
-@@ -419,6 +421,7 @@ notype:
-     entry.insert(KIO::UDSEntry::UDS_CREATION_TIME, sb->createtime);
-   }
- 
-+
-   sftp_attributes_free(sb);
- 
-   return true;
-@@ -1830,6 +1833,9 @@ void sftpProtocol::listDir(const QUrl& url) {
-     mode_t access;
-     mode_t type;
-     char *link;
-+    bool isBrokenLink = false;
-+    long long fileType = S_IFREG;
-+    long long size = 0LL;
- 
-     dirent = sftp_readdir(mSftp, dp);
-     if (dirent == nullptr) {
-@@ -1842,8 +1848,6 @@ void sftpProtocol::listDir(const QUrl& url) {
-     if (dirent->type == SSH_FILEXFER_TYPE_SYMLINK) {
-       QByteArray file = path + '/' + QFile::decodeName(dirent->name).toUtf8();
- 
--      entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG);
--
-       link = sftp_readlink(mSftp, file.constData());
-       if (link == nullptr) {
-         sftp_attributes_free(dirent);
-@@ -1851,46 +1855,47 @@ void sftpProtocol::listDir(const QUrl& url) {
-         return;
-       }
-       entry.insert(KIO::UDSEntry::UDS_LINK_DEST, QFile::decodeName(link));
--      delete link;
-+      free(link);
-       // A symlink -> follow it only if details > 1
-       if (details > 1) {
-         sftp_attributes sb = sftp_stat(mSftp, file.constData());
-         if (sb == nullptr) {
--          // It is a link pointing to nowhere
--          type = S_IFMT - 1;
--          access = S_IRWXU | S_IRWXG | S_IRWXO;
--          entry.insert( KIO::UDSEntry::UDS_FILE_TYPE, type);
--          entry.insert( KIO::UDSEntry::UDS_ACCESS, access);
--          entry.insert( KIO::UDSEntry::UDS_SIZE, 0LL );
--
--          goto notype;
-+          isBrokenLink = true;
-+        } else {
-+          sftp_attributes_free(dirent);
-+          dirent = sb;
-         }
--        sftp_attributes_free(dirent);
--        dirent = sb;
-       }
-     }
- 
--    switch (dirent->type) {
--      case SSH_FILEXFER_TYPE_REGULAR:
--        entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG);
--        break;
--      case SSH_FILEXFER_TYPE_DIRECTORY:
--        entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
--        break;
--      case SSH_FILEXFER_TYPE_SYMLINK:
--        entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFLNK);
--        break;
--      case SSH_FILEXFER_TYPE_SPECIAL:
--      case SSH_FILEXFER_TYPE_UNKNOWN:
--        break;
--    }
-+    if (isBrokenLink) {
-+      // It is a link pointing to nowhere
-+      fileType = S_IFMT - 1;
-+      access = S_IRWXU | S_IRWXG | S_IRWXO;
-+      size = 0LL;
-+    } else {
-+      switch (dirent->type) {
-+        case SSH_FILEXFER_TYPE_REGULAR:
-+          fileType = S_IFREG;
-+          break;
-+        case SSH_FILEXFER_TYPE_DIRECTORY:
-+          fileType = S_IFDIR;
-+          break;
-+        case SSH_FILEXFER_TYPE_SYMLINK:
-+          fileType = S_IFLNK;
-+          break;
-+        case SSH_FILEXFER_TYPE_SPECIAL:
-+        case SSH_FILEXFER_TYPE_UNKNOWN:
-+          break;
-+      }
- 
--    access = dirent->permissions & 07777;
-+      access = dirent->permissions & 07777;
-+      size = dirent->size;
-+    }
-+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, fileType);
-     entry.insert(KIO::UDSEntry::UDS_ACCESS, access);
-+    entry.insert(KIO::UDSEntry::UDS_SIZE, size);
- 
--    entry.insert(KIO::UDSEntry::UDS_SIZE, dirent->size);
--
--notype:
-     if (details > 0) {
-       if (dirent->owner) {
-           entry.insert(KIO::UDSEntry::UDS_USER, QString::fromUtf8(dirent->owner));
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/kio-extras/kio-extras-18.04.2-r1.ebuild b/kde-apps/kio-extras/kio-extras-18.04.2-r1.ebuild
deleted file mode 100644
index 9ba190026570..000000000000
--- a/kde-apps/kio-extras/kio-extras-18.04.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="activities htmlthumbs +man mtp openexr phonon samba +sftp taglib"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive 'bzip2,lzma')
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	activities? (
-		$(add_frameworks_dep kactivities)
-		$(add_qt_dep qtsql)
-	)
-	htmlthumbs? ( $(add_qt_dep qtwebengine 'widgets') )
-	man? ( $(add_frameworks_dep khtml) )
-	mtp? ( media-libs/libmtp:= )
-	openexr? ( media-libs/openexr )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? ( net-fs/samba[client] )
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-	man? ( dev-util/gperf )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-fix-sftp-links.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package htmlthumbs Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-18.04.2.ebuild b/kde-apps/kio-extras/kio-extras-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kio-extras/kio-extras-18.04.2.ebuild
rename to kde-apps/kio-extras/kio-extras-18.04.3.ebuild
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 2714686903ff..cb4c0b5380b9 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,2 +1,2 @@
 DIST kiriki-17.12.3.tar.xz 325916 BLAKE2B a84aa79acde6f9ed16e9f92a7e64b3b479e161e8f394321fa929c6da9083215c60bae64fce92d4a3f59acb59c6eedc95365e58475788eb852aa0ea0981bf0877 SHA512 68ef87ee08d3ece79a90eff2e231851bf0cba0c8dda335be68716188646c6b2c85bfe45b0d159d063ef80e51b096e5a8872037f82a79250dce7cb64139cef1a0
-DIST kiriki-18.04.2.tar.xz 327204 BLAKE2B 054652793a79b4eee0b5df0ed541647a459523c3594c9341cb79c4cd258c039f299f2fb988e5b95ba5212fe2dc3d31d68c43c7afd2ebd9a82823e82b72e57885 SHA512 74d5cc31f976cbe96a713a7d30929b0e96d94bfc2cbb559594e7008892f02531c87c0ef4cc556a2acf8bdfdd59c988f2c43b82a121975846a4b424cceb64c694
+DIST kiriki-18.04.3.tar.xz 327092 BLAKE2B f5b2af57eb2a81550f1957e14681c2336ac640783bdc1ab0a1a82193a0b8ae109d43155a596a7ebcf189523c4a7fec52aa5b82916449ba74952d1e2361c40265 SHA512 2d00d7d04768dea1000f5d96d69e069087085f5450cbd60425f686ae7dc177cef67575b45a107ef203c2a7b04e7aa2f9168b683d7c624c04ca8e85465d8b750b
diff --git a/kde-apps/kiriki/kiriki-18.04.2.ebuild b/kde-apps/kiriki/kiriki-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kiriki/kiriki-18.04.2.ebuild
rename to kde-apps/kiriki/kiriki-18.04.3.ebuild
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 5eed6c3b0ba4..fec1a6f2c2eb 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,2 +1,2 @@
 DIST kiten-17.12.3.tar.xz 11556408 BLAKE2B 4e6604d0fe67cb6a10aa43f8339bc161ff66c7699b26c88b4b973de84fdcbce2bcd448f82e670f6c7e5f5f940ab4707aca513c671cffc5d840b5265d30dc21d3 SHA512 aa84ca7fddf98eceb2215f4040b4494f529d7270f9b0157b916e3e9e97efbc9de0c6c7483d31f99eb17ac9a7c78e6765be2853090da9e86b379678678b8f2fa3
-DIST kiten-18.04.2.tar.xz 11555704 BLAKE2B 556188993fa3579366e56b35d7000b71a80b27d3a220954c2833b6f41af6e83392c979f7a16c71f16e3751db424f1d159da8f390359562e82c0c7260152ef81d SHA512 c98566dfc7afdcf93a7de2abcd1ebc82046286f67a3f553ddc333f071885dfe56aebc728d00d03076768db3fe8dd23841c79e677b2b558b5cfce59c4cff33f69
+DIST kiten-18.04.3.tar.xz 11554812 BLAKE2B 00f1d12ee3e39e83cae4fdc66ca78c99e7db389ae0aa91eb5f43a85a1ca3db3471e2f1f6b911fa94a0f58cf4ff021536c43508e68d2adc76d9663b201a64fa4d SHA512 b377ce0b7f3644c23301d6c3cd3a947e311a8b62e786ab9c1e66a3c2b0675eaee5d90db2023fe15e6c612cdf82d616e9afc13b90a69f3199c442249dbea63541
diff --git a/kde-apps/kiten/kiten-18.04.2.ebuild b/kde-apps/kiten/kiten-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kiten/kiten-18.04.2.ebuild
rename to kde-apps/kiten/kiten-18.04.3.ebuild
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 7276328fc370..0d36cdb8a60a 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,2 +1,2 @@
 DIST kjumpingcube-17.12.3.tar.xz 293288 BLAKE2B 4efcec26285087b8eedfb406c9f702972e93e609a6f2a34ff98e1cd7f097fc7c27d51ecba4bda582adf36c07affd2c7825a6300feb4c0790f711931c00d5b090 SHA512 880ac463dead49d103947b228f80153e38c43c0c75d7b1f9a60445f61fd19999403d8d04848250b29a1a3424c2d5815312e99ea1a3b520eb511369b26462e3cd
-DIST kjumpingcube-18.04.2.tar.xz 294072 BLAKE2B 5eb8533c32f5684980903a58903ed5ac64ebc6df857a41112800f6b2f95d78f36348103ac3323624d44e4f7e82ba49c72d0796c763e35bb300ee802f2dac6431 SHA512 5daf8c4788d924d5e7fb6d8cc0746aa4c396e6c5be18ad9e9f3ce7fe6d62a0c9f43ac151c71c62eb6a267c2074d6ac217d178b0b31b2b3e0efa16ca4a5e7746c
+DIST kjumpingcube-18.04.3.tar.xz 293940 BLAKE2B fb7610e9f3352954e1df4eeeff2ddd80fc4aac454f19bd1f7406c4131a34126990de633d79bac1569e1e96d1743d8f55efd35a857f63d877600b6333c6b0c5de SHA512 c10548aa970fec60f9306ee351f5129c4892dfd74746d782ef72696d41a6362fd92f6bbcc49abf816b455f1e6d8992b4f66cf9ddf19c6109596ea053dd04d8bf
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.04.2.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kjumpingcube/kjumpingcube-18.04.2.ebuild
rename to kde-apps/kjumpingcube/kjumpingcube-18.04.3.ebuild
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index b959b14b5539..0833864aab11 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,2 +1,2 @@
 DIST kldap-17.12.3.tar.xz 155112 BLAKE2B f4d124243e39f5ef94a9a8d5c9c0eefba9881c243867f8d873256cedb96a03f3e2791a390f2e14dadec84cf4255ff4627ec2cf435b3eead21963efa516bd1d3a SHA512 d7cf0fa6b7a0f6fdcc712fb91f3214a4696ceefdc5bbdebb67f5f03c59901e0eebc6a7010c51f17791ffef490f2e39aa82d81dd581f2e2075e9f3bb4a3e8d3af
-DIST kldap-18.04.2.tar.xz 154284 BLAKE2B f41b75af3444862b3e4a38145e891715002a453db7c1a885da73583eb0563f69765429801c8d7e2c88dff235f74d49fc3598a970ee54cfc3615035c45209afbd SHA512 2ea30ad9b0e6fe7750cbce0706d2d2985f54f0152331e613b369cf47913d9a0dbccfda04b9604a72f12c41d456b723bfc53d59f8381eb14602e3a2fa1a892630
+DIST kldap-18.04.3.tar.xz 154232 BLAKE2B 782e2a727d7fb14c9d844e227f52f700bf13a19d6ded85ec14bf7c6ac6bad9209e14e53743704dbce8d79d09ec9a6b43b4686abf9c1397f06c7f0ece0dbb0dd2 SHA512 7159d5dd37641ef68c37d00e03b47febdcb2967460b51dce318344426077ced9d17095b8449ec82b8f8cd736ddf12f5c71f0737cab9a21811c576f14d63ac9df
diff --git a/kde-apps/kldap/kldap-18.04.2.ebuild b/kde-apps/kldap/kldap-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kldap/kldap-18.04.2.ebuild
rename to kde-apps/kldap/kldap-18.04.3.ebuild
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 4f3851437965..74f7a251957e 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,2 +1,2 @@
 DIST kleopatra-17.12.3.tar.xz 1895848 BLAKE2B ed9c6b72edd555b1707ce95804c32ca7fb682016135f290677a7964af344fe6a2c1529f7b621626fcf5cf7fd1d7a72bff7d4d7e5e8f7c379a82326ee1fc9c343 SHA512 36cb2e8abe68d11e8d1919e1d87f80d0f926e3934432f0ffc0988574e5d82adf67fb9891fb3bb81d0c68b63d80f7165462dc78572bf29d5cd905284fc255cdbf
-DIST kleopatra-18.04.2.tar.xz 1902360 BLAKE2B ce263a0d82cd748f2fb061921cdb92bfd28493c73798bbc951276d2bf26c6748c67c37d6b3a6413353049885cda9bed35d5f1ace845e87807b051744a7aa3822 SHA512 d81e95ae5abca5c2b0ece5732fe7ef86036740f79629ea212f5c207293b514245c19ff0d6d5144228afa3d299d33e9126b5551220b9a671aca029b545e38f355
+DIST kleopatra-18.04.3.tar.xz 1902264 BLAKE2B 1571128442689e709ffae97092643195150a870bb90ceb0d18f7f8c6fbd1ad9c1f8e4f3b1424ba13d4181085bb18bf6a3ea8bc02a585858d1a0cac2b3e3fc618 SHA512 6f74ad1d5da2c1e2c22b42212010768af2dbcf108b337dbca9f21e2cb2a88e4899fec692667cc1515a46dbe8e942eef5cb86551a3f605b9d048345fc31277061
diff --git a/kde-apps/kleopatra/kleopatra-18.04.2.ebuild b/kde-apps/kleopatra/kleopatra-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kleopatra/kleopatra-18.04.2.ebuild
rename to kde-apps/kleopatra/kleopatra-18.04.3.ebuild
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 52fcb0edf044..e44b6e719216 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,2 +1,2 @@
 DIST klettres-17.12.3.tar.xz 21712168 BLAKE2B 79e8e2798fc50fdf0b78eac94f3d346fadf90e4ca70ea8e51cfbf298e08c9143b4ad68cfcdd7e7970ed02f4c4b16189403ebbcd9aea0c1f8ae6cb6a9c015efbf SHA512 a251699633712938393c81f314f9ef8069ea8ab792201ede097cfa2e46ddce6e2184add5a8959dcf6925a87b329b2b3b1acf134c9da1c25e3d39850a42276158
-DIST klettres-18.04.2.tar.xz 21713472 BLAKE2B e898fca68e50a3825318b0669caa0612dc6fff27bfc20c1557acfdfd54d31bfabfc492d0dc0daa90c28dd20a9f85e9aaa545ff37049765bb7b7ee5d148beb710 SHA512 62b51904e14e61b150050cc42d28d44068c0ef17a5e144936579c99dca64f70337cbd71bace797bc2d66e5f25f4d15a2fcd19c88128a3985d53f4861a6c70054
+DIST klettres-18.04.3.tar.xz 21713228 BLAKE2B 09f915c3ae3074544a2cf0e8c67c8b85be63a0aa73abab25df1f02d288fe9b780dd8569896c5848a22c45a19505b9111660396766454a56a7f3a9093abf45c48 SHA512 c579a1421694a1681d68716695210ad88bf0510647a4d0957ffdd4f86ce137ffb0693bb7a0fa7ef5d0a15845ce8ed85a909fb1711597b6dc8302ae43e0435b0a
diff --git a/kde-apps/klettres/klettres-18.04.2.ebuild b/kde-apps/klettres/klettres-18.04.3.ebuild
similarity index 100%
rename from kde-apps/klettres/klettres-18.04.2.ebuild
rename to kde-apps/klettres/klettres-18.04.3.ebuild
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index f056795986ca..aa333c381721 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,2 +1,2 @@
 DIST klickety-17.12.3.tar.xz 1410128 BLAKE2B 224d7df32d37039e289e436c60a432c94cfe4fbd1e467b846272b710e86a089f946e0dd9dfd421f04a1d890311bf293335ba0af1f78e1e40cfe6437dd9dd4aac SHA512 3236c3f294d7270a6da40526436ab789b722e61f17774cc337287f482602967ebb5428bdc843e45fb375d0ce227a0d20e4dbe285477df846ce46e52b215e5b18
-DIST klickety-18.04.2.tar.xz 1411244 BLAKE2B 580cd433d4058cd6b1deba78dbbd6ebc24d2d03648d28bf5c3b3d8ab1dd476aa181ac483c89f841ed5bf025e7ff3549ba2fd69cc4d401e9b498b6944164816b8 SHA512 89e19ee5952443dd390cc9d466681be23609d29aa70df73ee33f7c10860bcfd4fca9b3c648fcefd209f5b7a5c57ed1652f51f0ad6fbddfdf9cb6bfbbf7c8e592
+DIST klickety-18.04.3.tar.xz 1411288 BLAKE2B 318985d5c6c2766ecab4a8118043dd4f9ee4ced035a08c03ce9527f5b0a68db0f6447f950f0482a144d9d171ebe733d90963e13c9ba9cd49591999b6cef99797 SHA512 d7cfefc611ad711c2e2990995e1faf208dcc61f685ed792934ffa001c83958c319c3245a652135f2e460b8d7d160b8ccb357b4fc5283d68978d1449fca6fc8df
diff --git a/kde-apps/klickety/klickety-18.04.2.ebuild b/kde-apps/klickety/klickety-18.04.3.ebuild
similarity index 100%
rename from kde-apps/klickety/klickety-18.04.2.ebuild
rename to kde-apps/klickety/klickety-18.04.3.ebuild
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index c23d301b29c6..04dd5b2b2b19 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,2 +1,2 @@
 DIST klines-17.12.3.tar.xz 1667652 BLAKE2B 1159f2867e124b95475efe73a4bc2588eaaaca5172f4932e8aa9fcf5b06e6d895252e019550a4aef05f4d7c6cfdb17bd50b17a75f2ef59a4c7130e34c2496dbd SHA512 14a3fff0dd010d94b7e76308a8032c4bce428950b5024cb81676a18c264f0c1de7d87540d8a36060588beaad5da7f22a4140551b8c46be08cac7a50c314ff3e6
-DIST klines-18.04.2.tar.xz 1671072 BLAKE2B 54c10abc863478ae94a283c287667b17cfd5259bb955554d109bb2135c412a2ff2bce374537077f5db41a07224995f5e3590fd510335cafd2230f9d8150b724a SHA512 686483b05c52d478106b66924ca843f39ba1d5a9c0fc03429201f87cf02c5403fddd26bbe4b6f8d5ba141bb1e7f821e0cad0db5a576ec38c53705a6e3594d17b
+DIST klines-18.04.3.tar.xz 1670864 BLAKE2B 88e1a21189d76eb7658b2c89d64a8a6b062ff8efdac07c681e78108110b21f0f7c47f0cf6708a7072e22ab28717175b8830b523d6d8b076c62074d24f9774b25 SHA512 15885ee5afaf863e2cc95aeb8d7877741b12cd2d7e16fa0ddd2fc88b50231e4fee0e29e246017e6507e0e59fbf70616a4251d60ba235539870b6c50f141699a0
diff --git a/kde-apps/klines/klines-18.04.2.ebuild b/kde-apps/klines/klines-18.04.3.ebuild
similarity index 100%
rename from kde-apps/klines/klines-18.04.2.ebuild
rename to kde-apps/klines/klines-18.04.3.ebuild
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 28f5f2b4f74d..06de781ca8ba 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,2 +1,2 @@
 DIST kmag-17.12.3.tar.xz 588224 BLAKE2B 7e5a9c5eba52fe751b1bdf8f5e5afea400a82cb3b48bc8e5a31c7219b44f5fa69b9bd047c8e0b508c5229c367b2ddd706e0b2c7b26e18ffef8105310f2fefaad SHA512 d9815d9e59a25765a74b3a33253de718b333f53c32df9afefdf4cb6551f10faeedaed189e625f20593d8d3528b835a01a47891dfaed341f0e943a317d6c6aab0
-DIST kmag-18.04.2.tar.xz 589336 BLAKE2B 8a6a07a3bb1fdc48377bb0e10f9064eda578d5c3fdabf15bea347a40bd1425f178030a6d08e8690cfc7a0681cec2dd8700911e3343bc4d2b49ef64e4b9a5da41 SHA512 6b1d2a330ea4d395f3d67c1104310bff367e728317d8f96d46fcf48f84f0481937217bf96fa66fc1fc175d0dbcab91eb66f4773958be78ec585326324d8f0462
+DIST kmag-18.04.3.tar.xz 589340 BLAKE2B f195d8e3c7e4178aa123ee198a673dd4881826ec6c8c9fd488bdac60dc39d4fa2bf0adc1eb42028803e8cf5dcc498f68ddb7c99ecf0d0129669ba2138c4846af SHA512 f3a9890906143824f36e2bd5ea191ddf68aedd7afeabff50c884f00d160c9ad670e96b5563afb1d5b2c9c2ec7842a49c0ee62781ea9337086f40875607b4e09e
diff --git a/kde-apps/kmag/kmag-18.04.2.ebuild b/kde-apps/kmag/kmag-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmag/kmag-18.04.2.ebuild
rename to kde-apps/kmag/kmag-18.04.3.ebuild
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 71bdba4b8747..bc9fd16b4df7 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,2 +1,2 @@
 DIST kmahjongg-17.12.3.tar.xz 4084868 BLAKE2B 761d68c0d027110a6898d3697898ed6824681fed98bc0a87b042406432a6796dd771a2012866d82c2b41eaf447a3cc89c6baab72d3fb09002aa1d9f3f0c3ebe3 SHA512 c6835b0900e7969f65f5cf74cccdd0271aac1e4d0f161fea13812e91415db77b7b5937b75adbadd027a3b424e520de8cb7c9ce277dd29285ba6a8e439888e8fe
-DIST kmahjongg-18.04.2.tar.xz 4086472 BLAKE2B 9dc776378c8f7fd3ec0ac5e1af69ddcae9116b0ba2bf5c4a74ee6d458d1946cb6bec0fc0bbef0dc4a757a79a79ddae79ab0a6f3538f585c1bfe4fe7031243747 SHA512 08eaf4fbd38bc02fe61380966d13abd5e1b6c9814709e868912fb17db94f31a6ec68d3b412b2946778436bab4f837c818458274802a2651f2bb2aaec67d2415e
+DIST kmahjongg-18.04.3.tar.xz 4086376 BLAKE2B 2dc6c87c90eb6448ae26526c52fee81012457d56188e77fffe542bca3a2908627f538c37d84c2b2744c2105d2c09b13b938a9860a6f94d58dc00cdca77155ff7 SHA512 ce986e043a1620fc982ad0b6406214a53d4c3d912a36c5468fc9c4c986565fbca83e1f2d42179295fa7ba694ca1190fdd7c740d035c05fe378161c268ff8c0dd
diff --git a/kde-apps/kmahjongg/kmahjongg-18.04.2.ebuild b/kde-apps/kmahjongg/kmahjongg-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmahjongg/kmahjongg-18.04.2.ebuild
rename to kde-apps/kmahjongg/kmahjongg-18.04.3.ebuild
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 07968367bc2e..0e4768a549c0 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,2 +1,2 @@
 DIST kmail-account-wizard-17.12.3.tar.xz 153456 BLAKE2B 84dcb3249dc82d22e29597ce9396d788fa6447f0e5ab4ccb783904e54eb86f65e8cf7b7e583567bf7d61a45f4eda485b46e5abb9767f91fbb71ba95aee0c981a SHA512 c19d89cfaecb4072b1dbf4fbd059e522e60b148edb78eb94e46ec73d56f3794e29b4af198d453d6b837431fdb738ab22dc6ba3c98766c2848c0e3a24135bbd02
-DIST kmail-account-wizard-18.04.2.tar.xz 154980 BLAKE2B 000801b4f0103c71031f3562d87a16845b5405aa7f9f7fe778c447db108acac1ef0cfc9643f38904ffde3172b92b1a8323fa049cb23133ab1a49c6bb8c8df0d2 SHA512 ce867e194241539155e82260dc20c6550e65bdc81e44821211000e76304a44bbf9cf375802b955b8ca77c4b0393ce61b6fbd20d27ba7a057ca0572c1709d41dd
+DIST kmail-account-wizard-18.04.3.tar.xz 154896 BLAKE2B a35c47a78da31a280d3f2bb668cd777b1c30d0633ebcbd846381b4927c2a5433dc9bf7b3a5b36402d89b8ceafbbc1888b5dc7ffec11b6325f9713881aec76a70 SHA512 93e05feb39d8e31635ec7bb367ed8bda5fd5ac6ef2912763a080884e4a6dd03183f90e3768f80d97dd03cb25e3f98a2db567efc8b516b8597d52070b4e404745
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.2.ebuild
rename to kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.3.ebuild
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index b8f4f4ec4c7e..24f52eddf506 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,2 +1,2 @@
 DIST kmail-17.12.3.tar.xz 4746820 BLAKE2B a8ffca362a5cb7433917cc361a786039e9792714910ccd46b305d97826111d21502a9598bd044988949cf4b1ed74c3eb49a4cb70f5d7af22a118a876d3d17b52 SHA512 903e6accd92cf70134a162fcbe2bb78c5058453c4272ed2fae02cc75aaaf185da7fa87b64926c0ad6d40a3f42ffb60ba7873106076c034840cd75dd965e406a0
-DIST kmail-18.04.2.tar.xz 4757740 BLAKE2B 978cec7458ef7c9a2b8dc157a68e60540e44f6608abc1bb1d89b1301705732ac799e55b8d3867129e1dbecbbde01b9806b3cafcdb3a502a3cfc760457cec0da3 SHA512 d264a77509a36cbd702dd046472b4058857eee6f9ff808d0b15530b146df471948bc671b88e3839a3b1a13bed57878d515686245c368fef4bc0903df05c63d2b
+DIST kmail-18.04.3.tar.xz 4757552 BLAKE2B 281c4e131518dd6efb9172d5db83e6945570943f7942ace28a9d5542130ea9636191894a72043410c641b9d3d8731efdf5b72d0e25ee5058948e6f1bfdd2f3f8 SHA512 216f57078ea32ba4d9cae70e7c2aaa28957c677e9c0eef9f4ed32fd405f63e02881f87b6a44530d9ca65839535c775de4913aad83bec8e253ff6fd01a45f61b1
diff --git a/kde-apps/kmail/kmail-18.04.2.ebuild b/kde-apps/kmail/kmail-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmail/kmail-18.04.2.ebuild
rename to kde-apps/kmail/kmail-18.04.3.ebuild
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index cf502ddc7595..257b2e3765b6 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,2 +1,2 @@
 DIST kmailtransport-17.12.3.tar.xz 164804 BLAKE2B 79b2e5d28429c777f1b6f205a950109bf8f16310eb8e6700079a9e28c4876398e813406376aefbecef5565caf0d75262bef700f1a69ee59dff393ce93d10d18f SHA512 a90d305a0ca9e938c0629ac602862307f1561280cd8f90159e0d9eab48bc8e3ad67208a04db724bae5e8b5edb08ff7901843c86f3d6ab3b5a2d7092de127d513
-DIST kmailtransport-18.04.2.tar.xz 165044 BLAKE2B 2d9b4477832f7c56cb9d8e2a2abd02844a342fe7c24eab8a6f9f6d2f5a7a94f99cc4515c89c768ea72f82da4c2902666a23acdbe7e137490d1513212cc1d42f2 SHA512 e0f566d91d2c57de06234b6c1341bcec2c7ae5bcbca3e9707bce90d7df9522f204eea542db15a3952a9da4e3afcf8780328cd92bbb19f8f4549fc0a5522b8d71
+DIST kmailtransport-18.04.3.tar.xz 165156 BLAKE2B b303d8435e5df867b9c911f1c580f4a994b45fab9ac763fa58c6072629811f22d978faa10c8c1e6c7eca788187e27368a166210babe0b282084b424076e0acf8 SHA512 c371016a6d660b12feac9d1d705116537797206ff6b01d2fa488247929241f9b179a541dfb1d0da4d0b14e050f4e586b055a8228bc3339ac403f8e72c683626e
diff --git a/kde-apps/kmailtransport/kmailtransport-18.04.2.ebuild b/kde-apps/kmailtransport/kmailtransport-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmailtransport/kmailtransport-18.04.2.ebuild
rename to kde-apps/kmailtransport/kmailtransport-18.04.3.ebuild
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 56c1a48ab406..7e1beabe1f87 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,2 +1,2 @@
 DIST kmbox-17.12.3.tar.xz 24356 BLAKE2B 7780c408317bbc7aaf1d0d8cb128550afcdf0a8a5a5d035c51fe25a9b9870ef825f74351b4bad33f0d8524582771ff91f15297bd1e3c1d8c119c3d4e399af335 SHA512 785dfc65b7b3ef7b5bc9a1dde9d67d04d06110995fbc0b4112670c27350fdee4cfffdae7867dd73f07a431f4116b784faef716de902cf4da0767f396e7d3624e
-DIST kmbox-18.04.2.tar.xz 24552 BLAKE2B 8d118dbe61dbec68c3dfaab6215f4b9cde7497d2d286f42bbb01668d90028861d1479ef8e418ba7c470ae530dd38dd24065b04ff1c4aeceb974dd023ff731d03 SHA512 d0e5bf0d1e50d85d78e1ef35cb4b5931a31c3777c0f93175be9dc32dd0e07677bdfc542f5739db32a815715a1caef6dccf84a7153f1bcb1a9f7a2a3654cae570
+DIST kmbox-18.04.3.tar.xz 24552 BLAKE2B 26ef3f094ba959fa96a186332306d824367c66ebf2163a2f2f00398f57115540ced120c6a8087c73fba27e3e8f500f2573f9e42cf0aef597a3430c19c5198046 SHA512 72c82f74723f661d486e3c502e028072fd9c7556d73a364384898187e124e596b0eb0f62f4edbd8dc2aafc3ae2fb397545b4c1d04016d30a6232dfac9b16f99f
diff --git a/kde-apps/kmbox/kmbox-18.04.2.ebuild b/kde-apps/kmbox/kmbox-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmbox/kmbox-18.04.2.ebuild
rename to kde-apps/kmbox/kmbox-18.04.3.ebuild
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 14669a6b8bb5..deacf357a875 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,2 +1,2 @@
 DIST kmime-17.12.3.tar.xz 146456 BLAKE2B 106a985528ae9ecebdf3f9363ed2d84eb1067e53cdec59dae09896575bb49cb350527ee72c2d44ff5a7f48c8208360c2a919f8b1362bb5397796fe32d6c7a922 SHA512 f1d9ce2468da62836f9db461c2da71293ca38666576acece3c7e60c6f1bad10380f5db650c4bc5c4ebdb5bb12969c6a11f88e0e9205d265a8b0af825c34afab8
-DIST kmime-18.04.2.tar.xz 146424 BLAKE2B ba2209d6ef3b51b82471f6c9d2bb27ec10b5b0131022a91559d04a5d008553c4c0847ebab39df6dfe31b93331fe167c6a4f5eca2f908eaa6acff2f2d29c9d21a SHA512 3b6801391c70ac2fcd2b99cbfd605238fb70d78c8e358fc4a9382f8e3297a53ec8a4684067747f09887ca33383e7b0e356b4d5bc1c1f8e249e0ef317ec0c6d88
+DIST kmime-18.04.3.tar.xz 146276 BLAKE2B 41d9ec8feeafac110008de3816b4fe4e921368668ef7fc4813ee76b270106dae2d30dec79ddefcf144b4533574ee7d07e3ec25da0a8a8db1f3a6f19b80970df8 SHA512 274a0835fe429b6d442f287bbfc5953639bb4cae3c24f29bdb11092aa85ccb60d5b555161d778077460014fa5e5362f617bbefd630700696c2160d6013c220cc
diff --git a/kde-apps/kmime/kmime-18.04.2.ebuild b/kde-apps/kmime/kmime-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmime/kmime-18.04.2.ebuild
rename to kde-apps/kmime/kmime-18.04.3.ebuild
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 4c7301e9a712..46a6009ad16c 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,2 +1,2 @@
 DIST kmines-17.12.3.tar.xz 882616 BLAKE2B 80d87205c646c6f4fba54bbbc92361678e6247cf34859649dcff73eeddf62fb6830b47520ac6778aab43cb0378c7469f0f82e14636e57abf1305c7ad6fa4986d SHA512 09f17fc4ebb8babd9c2a1470269e55c9f10f94680577812aa65ef84191668226e4aefe206cdab4997a05ef9db1eb45a568563da7061de8be6d1629c1bbbc8a33
-DIST kmines-18.04.2.tar.xz 882576 BLAKE2B 4249254f7fc4acc460f022fd46e8abce2a257a881abac331dac5800ac2052a8c943aefdc1e8c2de6a18c9b606326830ba21a69530b3090f5cf87fc61fa03e867 SHA512 3c52d677166357872ad2555025f95afcfa15e5018d93929311f004039946e12e9f910f74409ae1836a51f6f63c89cf9e4f780dedef677475e68adf5526fe79ff
+DIST kmines-18.04.3.tar.xz 882592 BLAKE2B d8f942a971d4c0944f22f871b7a0861e3ae8329ae51d5745488d9e9715801ec5daa5efa3cc5722cbaa06cdc88585393571ebe29aaf6bd3831043c88e91cc49a8 SHA512 580730e896b70cb7923c34f223026f74c9451096d7cae53ef775c100957e774687e6e9902dee90c49b05f96d25480cc858269e0af462f7873516d9d91ea29374
diff --git a/kde-apps/kmines/kmines-18.04.2.ebuild b/kde-apps/kmines/kmines-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmines/kmines-18.04.2.ebuild
rename to kde-apps/kmines/kmines-18.04.3.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index e63fcda5bd61..733d6c7f6d43 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,2 +1,2 @@
 DIST kmix-17.12.3.tar.xz 1281524 BLAKE2B 7eb86417515b33a1ee0d50f87d20e2ade27df4be6792e9b2991065eb99bf123b0d5aefe4477c952a129aef08052dbc96960e32b58cafaad124e4072254e4d6b8 SHA512 e238331586a9c77792c10b1011f789ba739ff0811cf457e73812b31ffea7bc8bd4d3db66d5d50395676d1b8eebaf1894e01ae10166bddf7818c2833c6f346688
-DIST kmix-18.04.2.tar.xz 1284608 BLAKE2B a707ea2ce7b941c41c8ec651cb2764575814e85648d62b045d3a5bfcf5f003f0c08bc38aeff5bb6f3275f90483a2efb2b2fb8e32dfa3fc95a9fb97884135be37 SHA512 b178a31642f5f7a7891b8549598aaf1203f3ab779ddef660e161c16b466a6ca12270de4c75f29e8af934ceb099d425a42a6b384ca2a84e006fab3798bcc2731c
+DIST kmix-18.04.3.tar.xz 1284556 BLAKE2B 7c09365ef0629c55ae8bd88335e2fa2eeba7fd934f18dbae96025b992e94e51083b8293f6ab9dcab2efef099bb4f81a367319d5050253b628409ee5979545594 SHA512 768b787a939e10e045f7af4d8d6a47d216da17dd73c0d8d3d73a93855998bc3f345bc38d6b9298d63e8149523a6d9280ff89467edc01b2c085be8b138b29dad6
diff --git a/kde-apps/kmix/kmix-18.04.2.ebuild b/kde-apps/kmix/kmix-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmix/kmix-18.04.2.ebuild
rename to kde-apps/kmix/kmix-18.04.3.ebuild
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 1ee650b791b6..dacb8f7ad06b 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,2 +1,2 @@
 DIST kmousetool-17.12.3.tar.xz 110788 BLAKE2B b0212a774095735d69048430b0181a88d6c375ab74d850d8fd0a2e1978ed85a201d860fbf957b151f8f513dd785c15f4b3a8ec0616bfdcad43b456cd4a1ce010 SHA512 5e67d82d8034568c27e367f77e591688a3f9cb2fb0a84e06323994fa36f486004dc1bb9bf8c7d2cbbc42c234bbbcac95605e05eca6590ec53499f391b36eac83
-DIST kmousetool-18.04.2.tar.xz 112840 BLAKE2B 48a7577379660da0dcd42bbda8bcfdb43a5494f8db748ae13307c3d3abe621ed81a800615286e532a231a77a470c7a0c5aed05eb84ddc392d1a2dce323481acd SHA512 1ad3e6a0db007ebb1d54df1e0bbc063ea95843d06ab9b27bb3caa106f9570161d1d8078e0a77bcf333f3343e3843a45c1aacdc1e144604e458d845fe6c56713d
+DIST kmousetool-18.04.3.tar.xz 112816 BLAKE2B fe69bf4c4b5060732e2ec04b4ced3bedcf042a1779285602cdf8c92da6c1c9f21616d91c803fa750006d9eb74b3cad9709dd7a6daf9181c2f7315bfc344e7842 SHA512 46821eaecc616288892226d5f7c9a2eea97b8e2e822d2c98871ad028dd0b9b71404f2b74a6032299266623239d7a57e8ed09dbfeb6b8b54f50e8c747e98564b2
diff --git a/kde-apps/kmousetool/kmousetool-18.04.2.ebuild b/kde-apps/kmousetool/kmousetool-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmousetool/kmousetool-18.04.2.ebuild
rename to kde-apps/kmousetool/kmousetool-18.04.3.ebuild
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index fa85e8ffc368..bbff1905b80e 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,2 +1,2 @@
 DIST kmouth-17.12.3.tar.xz 1823724 BLAKE2B 782ebccaeab0fcbeba98fd6b3deebd3a19b445032e5b0b921d0130b88dad60b96cc4d7b46a5b5cc94b9a70620f4aee12704ad0c581bba7ca75d4218f5e17b10e SHA512 3f1af3952d8ed591b7e492f7db0ed3a80097b111e9b5f37039f71145ebb4bb6c907fad4748b6fb804e0f404ac1b30a7aa70e00946bce5ceaf3b54f3ad0f51576
-DIST kmouth-18.04.2.tar.xz 1766928 BLAKE2B 29bc1453fde206acc1edbe1bbe7c42a69048e6898a4143a076fcf4eb04adc436157e2db001d00f42e2eaa2c5eed933796996e6ecb2f229d2432e9b3dd244a501 SHA512 808fea7cb14d7bd30db7a879212f675cc8773cab5b2309c3b494c897da10f4290d4a447005b92e8fee6a9ad6249ea433c0de4d3d2b67507c3739961ba6bebd1e
+DIST kmouth-18.04.3.tar.xz 1766968 BLAKE2B f8145cb2f744228d684355d10ee05edc67030f558c62434dfaa38b82dd916fdddf4d68bdf67caf5b51b4dacf4088c2659ee617aea39dda9a5b2519f3189e407a SHA512 f181bdaed15040feded37576aa8539e42acf61bf06a1406ffc7fe6890ba355f45ecb96b8657629105606c555f1d7b798814987c1060e83855de1a9fc34708cbc
diff --git a/kde-apps/kmouth/kmouth-18.04.2.ebuild b/kde-apps/kmouth/kmouth-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmouth/kmouth-18.04.2.ebuild
rename to kde-apps/kmouth/kmouth-18.04.3.ebuild
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 9c8ff3747378..a076fc3df10c 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,2 +1,2 @@
 DIST kmplot-17.12.3.tar.xz 3024624 BLAKE2B bb733da35bc751b853e0e7f0b22f215552417bfefaa12d0591fd4a5d18e9c693b891a1521bece8e4bce68b653758001621078b082db2513a3814fe23f366894f SHA512 c82c6560e41aa24b7eed69fb24b1f96825b36ea8c6bc82a3d73d95aef74ceaf534bb4e7da64b68fd3a7e291e96790cee123d1c6fbef06b578996ba3df6180af9
-DIST kmplot-18.04.2.tar.xz 3029056 BLAKE2B cf068d238731e4cfbe4c7a24e79c4ed230b26150d2b5686dee11932b62e30e2ba4638656698c11f05d68e5c49ae69012e590338969263e93b36a6aee22e2014f SHA512 975cdaea1605b0cbff7fdf41bbe285e815002442944acbe300d86046831d11cc18dd9fcc22db517508f1081aff99177b77cf5519195dee2bdb10ff431f55f1b1
+DIST kmplot-18.04.3.tar.xz 3028664 BLAKE2B baf384a0104b44d3ddda7657e0a5135c78728dafcaee2c14a7e36a9251dc3e78ed627923b98bddca793b6aeb173c43eba6694cfad72215e8a38342510b620cda SHA512 798ac10e281efc393f111e222641f92a9a5cca94513f740468aa17626cabdc80fd9628a96972748a7297665957d7c5164f43036e51bef35269899e04d779708a
diff --git a/kde-apps/kmplot/kmplot-18.04.2.ebuild b/kde-apps/kmplot/kmplot-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kmplot/kmplot-18.04.2.ebuild
rename to kde-apps/kmplot/kmplot-18.04.3.ebuild
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 7ebfe076e435..e28d5e9129b1 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,2 +1,2 @@
 DIST knavalbattle-17.12.3.tar.xz 1220100 BLAKE2B ed09e00653164e254fbf1fa259861d26507ce61df5d126343691b804067c0facebf0aeb88d32d7d4d8f0440e66bb886f5ab469a904fe66d9980c83a7ce6920ae SHA512 3f15e67cff9ea4a055fe20896787568e1171cd3de58b57334be1bc3a50c0922b87a8f81c0fbd7acbe793c5882aa06581e73756f91bf15cfce3047dfa057e26e2
-DIST knavalbattle-18.04.2.tar.xz 1221364 BLAKE2B a060419c78761ce62c508bf8bcf938fb7d3d5add12a2971efa0af1acbaadc741e2e97f84850ceee3511359f7dc87f07cc6ce288edf876e8f4d77d58c59fcb656 SHA512 f6406b65b8933dd5c9752274ea2ea6af4a437e0b5e7b691fbdcfcdf60e6ab3a2eb403a315cb5a352d6e63a55686c3f59d89455ac0ab0efe6b4656d0c02915606
+DIST knavalbattle-18.04.3.tar.xz 1221332 BLAKE2B 5e074e09f71628032237a5bc19dd5acd19d3758b9b740511ba7bf2947577f23f0f3ce7fdf8e3083bc864af4c28cf06f423f1a1134dbc5434337c10249ab64aaa SHA512 67b9049d55e975dd5f1dc9f9cb08bd3102d633046c75bf172abf33e12506774f3e6606f63c3af6e1b23e0d42494a1b4945f019b9f2bbed7d7d64df8609cb2931
diff --git a/kde-apps/knavalbattle/knavalbattle-18.04.2.ebuild b/kde-apps/knavalbattle/knavalbattle-18.04.3.ebuild
similarity index 100%
rename from kde-apps/knavalbattle/knavalbattle-18.04.2.ebuild
rename to kde-apps/knavalbattle/knavalbattle-18.04.3.ebuild
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 570a05c7313a..71511f8adb68 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,2 +1,2 @@
 DIST knetwalk-17.12.3.tar.xz 981588 BLAKE2B 9ab231ff78d0ded0fc44a1f3d719f512edfc831f2eaad7a1622259c399eee6272441532ae24ed40f324cb8ec65e8484954c1f0087ea8c6021e640b7a499fb462 SHA512 c7fc0cd8622eadc3036a1a286736162a9c6240546741591b48b74d4b5fa84aec25b5764ffd05ef7ec2ab85ad97bee7c0ec63d3f009e07410444f09b99f26ea9a
-DIST knetwalk-18.04.2.tar.xz 981508 BLAKE2B c32aaa82d2996b1b0056b1796595acbb861baeba3b7c809f6ca4176e9bdfe5adabffeae6df1d389813cf22faa57f27c029cf27e91af0a3dbeda51ac8e19a80b2 SHA512 e5a4de400e2e67492bb5a5031617e6a1761236c40461e7ebc6062499adb50e7eca52f8205ac4c3e177466a3669ba9172426714cd7c816c70995aaab4fcd9e736
+DIST knetwalk-18.04.3.tar.xz 981328 BLAKE2B bab9922b39d0a8ae7fcbd62812fa2bdc14482e71213335049cfa45ed7af7111ce894d03bc5508751a24e6dc54baed50503a0e529ca45b4999dfba7b5afcf4266 SHA512 1d2d778f170d0ffba2ac9052c53a256ef6682ca82573fbe09b75cf5b00ab6cb4ce0948a3f40ec8bb75b39563c7ef383bde23fb2fca794ce6927e996acfd25e9b
diff --git a/kde-apps/knetwalk/knetwalk-18.04.2.ebuild b/kde-apps/knetwalk/knetwalk-18.04.3.ebuild
similarity index 100%
rename from kde-apps/knetwalk/knetwalk-18.04.2.ebuild
rename to kde-apps/knetwalk/knetwalk-18.04.3.ebuild
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 185aa9d105f8..e7c8a5a4fcef 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,2 +1,2 @@
 DIST knotes-17.12.3.tar.xz 335744 BLAKE2B cb49c9542939bafe89846470d3a799128ff8f7397cdff3185e281fa8c00df40966560403f60639c3afe688bf863c4566073f561601be188eaa88804847a0c1f4 SHA512 b3c24cecdbfb72280d2fdd83b1cab481691980a9a29cd93a33af2a62421186b06d4df98bbde484d50140d8db3d17b0ea6186208bedcab7094a314fa08e5fe085
-DIST knotes-18.04.2.tar.xz 336128 BLAKE2B 46b26d89c1866f1eb94a57ac1a0e6df1a0cbb82178065f08b5e5e742d317b0361c4a150be1b380a7a2a77afe70acbc6419d5b58fb38a83fa8c319017825ea814 SHA512 b24d4425938dda5a1d57f18c615a442ecca30db94c2633e1844880739b0ffaf10cfc81ac583650d015cf8360316fa6d36f497f9ec0430c368e39c6a49c40822f
+DIST knotes-18.04.3.tar.xz 336096 BLAKE2B dcedf008475796e561e411e7739e58d68dfe0557c8d64a30390299ee46e40c1d5e8e5a8cb34946090ed8d6c8da323a5852a201bb24e34e0ebaede21b9fd0aa6f SHA512 899ea5a22b4e0885acb41ca1d4dfd04a399186c452d29ab9672bd0099acafb1b089e1b82e81bf6af8f803fcd89f504adf9a74ceed7c52ba53e3852235999f0ec
diff --git a/kde-apps/knotes/knotes-18.04.2.ebuild b/kde-apps/knotes/knotes-18.04.3.ebuild
similarity index 100%
rename from kde-apps/knotes/knotes-18.04.2.ebuild
rename to kde-apps/knotes/knotes-18.04.3.ebuild
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 8ccde9fe2534..1938ddd01e8a 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,2 +1,2 @@
 DIST kolf-17.12.3.tar.xz 923672 BLAKE2B 2329786f8dfbbee92cbcd84219b091bd30872b44179bf1f688997df0b4fb05ba4a2dc45c634873708b4a2dc365dec325b21af8540114814c81648015e1a7242b SHA512 8040362317639222c4b4046b65de77888d66daa3e7d99dec9661e8b868b253408f3f45b5636b4b5771e0bc07700d506810e95e7339141901947b8bec78b5e92e
-DIST kolf-18.04.2.tar.xz 925316 BLAKE2B 246118e80c47ce8c71f1626368bfec0370af43890fe66198d007e29074ff1d0a6597ff093601945c92d68109a2183c09ad038289271d008ad9496289531ee5d1 SHA512 452622ded7e36112978792ecb3047ce9fc599ca031145f3e0505bbea33d66811c9c0e5cdc613a71afc03d5997d49334b6f921a005a75dae872bc820c8ae67652
+DIST kolf-18.04.3.tar.xz 925060 BLAKE2B 6c04a8e60f0d0a12375f782b722f3f9172210f230725c70d26ed9d0b2bf2740d466380b0278c1ef832029ce48017bb0ac1ef889f03e56c16dc401c353c1ad81f SHA512 e14b94419504f531b615c7dcd7918c2ced7b7512d7219b60680533a16e365eeb3bfcf9f7db3d4838672a4fc70494dd7758a9ea409c87544f36018f590e7160a6
diff --git a/kde-apps/kolf/kolf-18.04.2.ebuild b/kde-apps/kolf/kolf-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kolf/kolf-18.04.2.ebuild
rename to kde-apps/kolf/kolf-18.04.3.ebuild
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 7f5b429bb75f..e2238e1c310b 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,2 +1,2 @@
 DIST kollision-17.12.3.tar.xz 272044 BLAKE2B 86178a9a39c79accfd21e8797feddff506cf260e81c407c32ab465894f37df9877619aecbc66619f04f10b887ca27ade0c47bc1a96d1e24ce34d81a04a51993f SHA512 e28d33f6fa0e52b08c674a68116586561bc0a786fc089922c313107d1d3b39ee89768192a203fc7473cdfe40fb67675e421f1058443703df859f1003371f1393
-DIST kollision-18.04.2.tar.xz 272596 BLAKE2B db9f20b54e97f112d6a1f3fa99fa1d7ecc08c4840821810444997c0b888ac45bd53acd2859e53eb2b37088d8ef10b511a427adf15f784f5f27a0a75924750584 SHA512 97eba84f25a88abeb21165e69bfdcc5cd5da3a0f06e278eef510d334d7bc443503a0e363ffef8c59f2625d231d8f8b99450fb351b5c7ed34b23a85a7eccfa72f
+DIST kollision-18.04.3.tar.xz 272564 BLAKE2B 27ef55f7dc587267b10af8d1db7de418575a8f9cf29bcd651cd093b3a8bd49e1698d79d1099ad7a91ee5a35ccb83f4f4a96b6d9eb634c808aa645796608e9b4b SHA512 c4db5f6a96364e86eed8f344bb378752c9c05e147302d029aedc9a6926a761ae71acaa5b37ae39abe14e6ab7b0e9061ac26e495b5917d6b3cf862516898db58e
diff --git a/kde-apps/kollision/kollision-18.04.2.ebuild b/kde-apps/kollision/kollision-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kollision/kollision-18.04.2.ebuild
rename to kde-apps/kollision/kollision-18.04.3.ebuild
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 48f710b45dd4..98c9349fc2fe 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,2 +1,2 @@
 DIST kolourpaint-17.12.3.tar.xz 5546236 BLAKE2B 9cf7aa982fc92fcead172a43bcd0a73b9fe88b05a893d51251600bf3a22eee8973f112874f5253bc127c8b287837a144d0f2a2e21b997affb73979af50b34797 SHA512 abe94f8bb56e975914302429f9d38fdd7ee5cd7b7942f0684fd993c2db0c3b7ab83b7562eed2c1e5d8330939df7705ba99dfe15249a5f6f1abb6c5b1e837d2fd
-DIST kolourpaint-18.04.2.tar.xz 5549144 BLAKE2B 71832c8f9848ab18887a897fdc1d01f0b1cce5bc2c6c6ec76c1273df65b27303122b039a6c0795878f1d5ebb7d179cf22a25e225916ff49684b9d2c37c52cea2 SHA512 9bf3b8cbacafcf118bb073383af800c94d05c35c100270adb874245557ff4bba13e0df35dd287503d348610615ceb13b7894f214bec211e6a3132b570534003d
+DIST kolourpaint-18.04.3.tar.xz 5548984 BLAKE2B 15017e7bfe7b7a8c82f0340f3cd4e222f3871f476f2530df358ca65e0f1971ec85199f2ed67e1a86a998331b4a5bec1e3ba1ec0b4ad5ef8d3d1c949ea074c216 SHA512 e9e90e16ac93f019327f9987f546ea55999a707e5ac93218a6850669bd729506d80c52e2e1cdc78d5c2d12a3abc696412c7eee07343a2bf726d7c5fadb5ff4e0
diff --git a/kde-apps/kolourpaint/kolourpaint-18.04.2.ebuild b/kde-apps/kolourpaint/kolourpaint-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kolourpaint/kolourpaint-18.04.2.ebuild
rename to kde-apps/kolourpaint/kolourpaint-18.04.3.ebuild
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index f1f175564e1a..285b5c2d60a9 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,2 +1,2 @@
 DIST kompare-17.12.3.tar.xz 710940 BLAKE2B 421d6c9a348f7f50272fba87c3c92f078604c1f4d641514ed30b92a1f8582291b69f85bdeb027a390c6c71df783db54217ed7ba3b12d60aae398696c0589ac44 SHA512 19cf624d6e3362d3b0b6d384b08aea25b74aebbeaf7c8f6c4849eb233f07016189a393551c2a0a60b4b31094b4f5de1d0c1bd747c0829ee2f2276e570a22e483
-DIST kompare-18.04.2.tar.xz 712272 BLAKE2B d67b0d210c1decce0b210ebdee16fa91a0dcbd82ab8e01b753e76608ecd57deb71fa6d1d5b5c44eb9a98c8ffbf9281f06f2f079334b340dd5eff0a9c7cc11184 SHA512 7e8f9c3b9b3af51cc454de4ac8a4bd31cba15a0166fbc209edda82979c8782e40beb82bd390869d7bfb7ad45ff6c905a58d4f3514d59ec2e20915a76937e699d
+DIST kompare-18.04.3.tar.xz 712096 BLAKE2B f2aba3342dd778abf88daed69967191dbb34cbce9afd006ad9d73341667d4f3c7270b942ea0d89844fb03b663901b04868ee043d3797a03ef9d0b1ec9447034f SHA512 16cbea4ec5202f073fe7251db2682031915509b888eb5ecd098d72f20438ea23576750976a4811f922bba1863f08e280a5f7045248e97e3060c3d37b81ae1b65
diff --git a/kde-apps/kompare/kompare-18.04.2.ebuild b/kde-apps/kompare/kompare-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kompare/kompare-18.04.2.ebuild
rename to kde-apps/kompare/kompare-18.04.3.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 1c48d739bb9d..56b6733bbec0 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,2 +1,2 @@
 DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92
-DIST konqueror-18.04.2.tar.xz 7731372 BLAKE2B 41a2f7ed09af82b2868486efac8e533359ff597538cbc6224a1fca8dc520bb7f9561001c3fe6d0dc81ebeecccb609e4b62bbcd311e1cb4c308836d0a3e994174 SHA512 59d05a0740ed77418791ca4006053a5e9f2fb4e7fc492cb2f8524e6c759fe3ec9a77870cc6183582930d7eacd60a6a612848bea017fd4f8b2f356e758bd3fff9
+DIST konqueror-18.04.3.tar.xz 7694900 BLAKE2B fa20f95abee369084796785b622056b759c3acf11f6feee597a0ac788c9d64740283f6bb4e45150b2eb52f4de8689f1e66d3c4f3cf1e8f6d50ead6eae8900e16 SHA512 c55c0bf0f97c5ecaa73c7c56e2fd236642620b9256ef6f7dc3bd922b8d590e33c2524ea154d8308fc9dac9196e5cac3bf08d109565afa756ee6d54264ee4ab3b
diff --git a/kde-apps/konqueror/konqueror-18.04.2.ebuild b/kde-apps/konqueror/konqueror-18.04.3.ebuild
similarity index 100%
rename from kde-apps/konqueror/konqueror-18.04.2.ebuild
rename to kde-apps/konqueror/konqueror-18.04.3.ebuild
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 8d891be0f68c..01c80774066c 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,2 +1,2 @@
 DIST konquest-17.12.3.tar.xz 658364 BLAKE2B 45ab884319512ffd4e8264b5cff389906c53552148825eb1028ae5bda9f324f00df19bb11a45573aa42f5c07aab0f451436fff1028bcedb0c73df4024993a4af SHA512 24c7dea266b3acbd7d006592c15a0ed28e55143a04ed107806bf9476eeb0ac8d30af18abde283e89433bb86f151d5e0363c8db672aee49368a53a963ad3bc7e2
-DIST konquest-18.04.2.tar.xz 658928 BLAKE2B 452ee54581a3912400d353b3a9f7dbfb834eeb5f5d2f2e740ac28ee39d0809dbb3908a1077e9b918d90b8baa7a3afda41ffe3361d9a1ccecbf192b7e6e5673b3 SHA512 16dc001a4cbdc6038e286e355363cd6ee37a5a3b966aa2711a0287ef3d41af3ec2297f622eed01a3762f564bee5bc19eed17a4805456fca09d7b0efa8fcdff6d
+DIST konquest-18.04.3.tar.xz 658784 BLAKE2B 89d675c2bf2bbb8a24c1bc337782dd489c4bcc9cee4539fac34f2b92eec5036067138d888a0af48119e25fbdb8b9c00c14a6f916da636df1102193106a7f5c79 SHA512 211830edd3a3bd24f48dafff7a0e60229f3f24296ba91314f93c00d5494400df7f34a54b792dbfffb5d57f5a169135563485839637055f6234590f95cf38e216
diff --git a/kde-apps/konquest/konquest-18.04.2.ebuild b/kde-apps/konquest/konquest-18.04.3.ebuild
similarity index 100%
rename from kde-apps/konquest/konquest-18.04.2.ebuild
rename to kde-apps/konquest/konquest-18.04.3.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 1bb8756e015e..13219653ebd9 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,2 +1,2 @@
 DIST konsole-17.12.3.tar.xz 1026672 BLAKE2B 98f2f545aae26965009a79d196640811702e9444a21c665db1f4da277a1059943f192a31ea1020c52867523ad40bfe21bc09503ec2643b289da1ed69c7eda30e SHA512 973c47341ebe729442ba8f8a7523eccaf5da28afbfe236fd4ec2897f710c3967f22ed5cd8f2f997f631a5369625c830f7a4540cdf6953874c2f556f547c413a0
-DIST konsole-18.04.2.tar.xz 1043764 BLAKE2B 7e1eb21e230190cde87b92530d101548e05f24923fe0ac2c39a3bbc43ecbcfd665b2d597ddf1a76618c7aec00bca8ff072cf7be3791e8fb2c75cf0dc9337ad73 SHA512 043d7cb544dbf583b409dafb095e4081fe652612d1c2ee9f94c2658d99ff370d0e5e0bcafafbafe2e468a0cf7db8fb627d84a846e4545c2420b7f9285a00ce12
+DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066
diff --git a/kde-apps/konsole/konsole-18.04.2.ebuild b/kde-apps/konsole/konsole-18.04.3.ebuild
similarity index 100%
rename from kde-apps/konsole/konsole-18.04.2.ebuild
rename to kde-apps/konsole/konsole-18.04.3.ebuild
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 5717721585b7..19e829e6a85d 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
-DIST akonadi-calendar-tools-18.04.2.tar.xz 221200 BLAKE2B 6c978bbe881ca6272ea457302f0eee0ff0f57ebdb4b0c5fb2a50cc50c7ca84457cd4ccbca609f6ee0fdacdf45cb719dc5b0b98fc982f06643bb43155434416ae SHA512 2cd4fea39b0e79d699ecd9be711b0061d6e6190b97add422a572889c6882666fb75d2507a4ccbb69c9bfdbb62daf28316940ff635f19e3b8a867003017abafe6
+DIST akonadi-calendar-tools-18.04.3.tar.xz 221048 BLAKE2B 66dda4fb9e796f12a06a314197d95f33117dfa5c0d962c46edc6cceef225407f4b9ed4acc334ad9927c151f7e4709dcb4deac78d0252b5e62ec78cecc2ae2079 SHA512 25183856d3bc5ee2b1bcff27055479c9694df37db169419d0ef3525adcdebd06dae07134ab7ebadc42afd9d79d7598574b8c5036e6c295b0986af048153b1b9b
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.04.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.04.3.ebuild
similarity index 100%
rename from kde-apps/konsolekalendar/konsolekalendar-18.04.2.ebuild
rename to kde-apps/konsolekalendar/konsolekalendar-18.04.3.ebuild
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 52883f006342..985d166236b2 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,2 +1,2 @@
 DIST kontact-17.12.3.tar.xz 862984 BLAKE2B 3428fea3f4b207fabf3e0a486044f79487baa1c3d5012835f4d502c884212dd9973d90c8ad2dc2eb53ee17d47bc1d6dd40f75dcb2202b696406f9f054956aa8d SHA512 f6ec9c2e4631246aca06d6af1cd0681d7cd1477d6932ce24d444f3d74e9805dc91da62afb40093e088390778a2ca08c92ae186d30de99bb488406cbdda7a0c86
-DIST kontact-18.04.2.tar.xz 862824 BLAKE2B d89e0a29f55d4521b2c58429a8924f7b107c7bfa31558d1addc262a1c22d7edd127378b10bda64c7daf715ae7f97a2860207356098064a2113d57d4d5ffa8a37 SHA512 7347a1d9fe8fdea2b7f107fd5e5e498f1ffa49aed763272db1e6bd26a88786dc196509f5f8b6a16e4f642ea5d5f457e056d3b921180f58062d1afd41f7eed9c5
+DIST kontact-18.04.3.tar.xz 862824 BLAKE2B f9bdd0833aa84e971af18894677bb43ea3f7c857fdebd1e2352403599927a90cd80c878a318cad992c6bef15b1da178b836db0eb73d913ddc2bcdeb94147e0c6 SHA512 e902e9089f26d831fd85d91415d13a259cc91866e1df4fc4bc3a25bafbf67d180a44cfe2f18f0f49f94a11efe0e5f43737ab49ba8a761b24948725221f2218c0
diff --git a/kde-apps/kontact/kontact-18.04.2.ebuild b/kde-apps/kontact/kontact-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kontact/kontact-18.04.2.ebuild
rename to kde-apps/kontact/kontact-18.04.3.ebuild
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index e1126fa6e535..54ed4e8d076d 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,2 +1,2 @@
 DIST kontactinterface-17.12.3.tar.xz 32768 BLAKE2B 3bdfcb9910bd733a937a90cf24b9af15b6dfeb5c41a996f86229a0cbdebaae3103e04fbb21f957f6e246891345deb7167d99cc492d84832e5ebba28910c2fde6 SHA512 e65bbfb7e717f60aafd47d4a0f8f37da3058a1c1f7b6ada3e806b1c292502a91bd2f7cb46a4e9f2512e8b4f33aa93fd91cbc891b68d89ddb14a33acfc1b0aa57
-DIST kontactinterface-18.04.2.tar.xz 32952 BLAKE2B 50a6a8e86c0bc9eb9d884268384289c2addd93ad0249e725f37fac4195f6d149c913a71d254c42c3a2bd046795a528e423c701ed79d8840012b8c41cba556c13 SHA512 d07eb07d26173cae09188e33f83377cf6ba3218edcbd4130a73ab04c494517ddd280034133a30e20bcc641a7df2b402895a146ccd9d48b94e98e70d72d1f252f
+DIST kontactinterface-18.04.3.tar.xz 32892 BLAKE2B 984b35cca9863cf21cdf7c19c891a0ad7bfb1b3874fb2657d69f766adf16b8d385a4d1d0837938ef7b1e00ce70f0a12ecf9c1bc153fe039ad48283293c543fb6 SHA512 2c1a0ac71c5222189aa37ab606205cfc7f7fb6506cbae97058c73584b5195547c2d7813b12f05542173853081b6ce54cc9792d4c9d6114e424ba5fe24b3bcfcf
diff --git a/kde-apps/kontactinterface/kontactinterface-18.04.2.ebuild b/kde-apps/kontactinterface/kontactinterface-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kontactinterface/kontactinterface-18.04.2.ebuild
rename to kde-apps/kontactinterface/kontactinterface-18.04.3.ebuild
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index f46ca8c19510..7ec8e8b5bb8c 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1 +1 @@
-DIST kopete-18.04.2.tar.xz 9569128 BLAKE2B 87a8e398f9db0d11057beb281c2604b3b5b2169526fd9dbff6a6de15b79e4d895be57c9255dee90c8e97a8456ca9d99eb6b156ca492e49141d614742c204930d SHA512 b015fd30344f2d55c4026332d9c51578b0ac242d329503b9b8039c1c1b5d18dcafe7122a9d79820452978a55c3ca19fbfdefa68c444ded5ed81afaaca348f746
+DIST kopete-18.04.3.tar.xz 9568508 BLAKE2B c20ffb4ffdde34f94a400a7a42b6c36a3432df8db438b9c94cff50dec5b9a39f03679dbbc1a38151c517d99ee4d8bb4c8b7ad0e79e4947ad1643cc0f7d0064a7 SHA512 568f36895f66df00e4207e893b7a782111df5fee6a875d77aad30a214088589d1c317c0131eb3b21b264224fb8bde239b31af8c9cda4405079990e3f5999edc1
diff --git a/kde-apps/kopete/files/kopete-18.04.2-pipes.patch b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
deleted file mode 100644
index d52b71947004..000000000000
--- a/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8084cfa3a0b3342e73fa128f89c7efd6bac79a36 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 7 Jul 2018 11:14:32 +0200
-Subject: [PATCH] Fix pipes plugin build (missing moc include)
-
----
- plugins/pipes/pipesplugin.cpp      | 2 ++
- plugins/pipes/pipespreferences.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/plugins/pipes/pipesplugin.cpp b/plugins/pipes/pipesplugin.cpp
-index f86733b5e..27f3e5e68 100644
---- a/plugins/pipes/pipesplugin.cpp
-+++ b/plugins/pipes/pipesplugin.cpp
-@@ -353,3 +353,5 @@ void PipesPlugin::readXml(PipeOptions pipeOptions, Kopete::Message &msg, const Q
-         msg.setHtmlBody(body.text());
-     }
- }
-+
-+#include "pipesplugin.moc"
-diff --git a/plugins/pipes/pipespreferences.cpp b/plugins/pipes/pipespreferences.cpp
-index f43b42af7..0ee22216b 100644
---- a/plugins/pipes/pipespreferences.cpp
-+++ b/plugins/pipes/pipespreferences.cpp
-@@ -108,3 +108,5 @@ void PipesPreferences::slotListChanged()
-     mPrefs->pipesList->resizeColumnToContents(PipesDelegate::ContentsColumn);
-     changed();
- }
-+
-+#include "pipespreferences.moc"
--- 
-2.18.0
-
diff --git a/kde-apps/kopete/kopete-18.04.2-r1.ebuild b/kde-apps/kopete/kopete-18.04.2-r1.ebuild
deleted file mode 100644
index 9bbb27070fb0..000000000000
--- a/kde-apps/kopete/kopete-18.04.2-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise jingle meanwhile oscar
-testbed winpopup +xmpp yahoo zeroconf"
-
-# disabled protocols
-#	telepathy: net-libs/decibel
-#	irc: NO DEPS
-#	qq: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn:0=
-		sys-libs/zlib:=
-	)
-	yahoo? ( media-libs/jasper )
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
-	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
-"
-
-PATCHES=( "${FILESDIR}/${P}-pipes.patch" )
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/kopete/kopete-18.04.3.ebuild b/kde-apps/kopete/kopete-18.04.3.ebuild
new file mode 100644
index 000000000000..63ad39620103
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.04.3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
+otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
+
+# Available protocols
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	oscar: NO DEPS
+#	telepathy: net-libs/decibel
+#	testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+
+# disabled protocols
+#	irc: NO DEPS
+#	qq: NO DEPS
+#	telepathy: net-libs/decibel
+#	yahoo: media-libs/jasper (service shutdown)
+#	skype, sms (until fixed)
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0=
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt5(+)]
+		net-dns/libidn:0=
+		sys-libs/zlib:=
+	)
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-base/xorg-proto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 0cefd8509a69..88762100f0ce 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -28,7 +28,6 @@
 		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
 		<flag name="testbed">Enable the testbed protocol.</flag>
 		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
-		<flag name="yahoo">Enable yahoo protocol support.</flag>
 		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 0d3351eae155..1a0484ee8d73 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,2 +1,2 @@
 DIST korganizer-17.12.3.tar.xz 2257368 BLAKE2B 3ecd3ea0711df1d7d45f8b2e8efa0942e0f1e189b08c1fab73c18aa8358ad2175c2b4f69101d29fe062894f9e614e35a72d7bae39872221b63edecf3ff70d8e0 SHA512 c6127e3d0c8a1892b1da4435885076172f6026f83fd412a0069ce0cd75156e7211356b07032ec2f673d5d38787bec352f03aff561143e50f61909ae7445bb686
-DIST korganizer-18.04.2.tar.xz 2266972 BLAKE2B e6ae3ab79479acd8c9ff1d53d18d2552e2f9c6ae4a9d7a56a973626b12fb8815d4882e3b3bbf58e1600fb804362f5ee92b6ada991e47a6b3a0688a6d1ec3fa6c SHA512 a5c2f42151c761fb940d6f3c8d6488e910f0db44c18321e123068c69191002a1a3e8197e9217ff8c0bb3408b2e106916f0331f53155e5f432f488b81a5f35bfb
+DIST korganizer-18.04.3.tar.xz 2267176 BLAKE2B 2731a2660d2eea48e61cacdce4d8f73772bfa8cd6817ff50059ac8a92c31b7aa3b56064f38c88c915dcd3a0a1f96a5a9ba85e9b251aca48edc0d3ed441041aff SHA512 52a777001ab986fd1f1bfc573519b2a19d0b0308f654a4ecfc2a273d88c0feaccdde86a044d1da1617fae4442811d3e9c35628e6199aa776cc8fab61c13bf5aa
diff --git a/kde-apps/korganizer/korganizer-18.04.2.ebuild b/kde-apps/korganizer/korganizer-18.04.3.ebuild
similarity index 100%
rename from kde-apps/korganizer/korganizer-18.04.2.ebuild
rename to kde-apps/korganizer/korganizer-18.04.3.ebuild
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index a2294b0f58f9..222cf45bdc37 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,2 +1,2 @@
 DIST kpat-17.12.3.tar.xz 3566240 BLAKE2B 0fc1339871589216ca0ed037e89c12fe9a0e66279a51c71da9913ad035b528dd0ae9ed59b07f656142bed1a27b8f1214f9f4ea4a1231dfdee3ee69ed819a5b41 SHA512 e30ac4a80c81285513d730cc331e2c93c208bc2d6a1521914675bf46307f9b90b612e2ed247224cd9495b443cd67efb6b01a009c62727abc127e112d94f0d25e
-DIST kpat-18.04.2.tar.xz 3564884 BLAKE2B 58b77cb6f826a0403e7f431a1e105789ec117c3dff8aaa58d00252d5ecaf96216a66034d5ac1aa13a98b6507ba05c903a13bea5f45c2ad223a01c0eab5d3ec34 SHA512 10a27e4d9221743443608783236055e87929478c29c43e454104b4935caa76f9c49e0c625c04365d8a7fcd28b2eae66e680adbaa8bcb669f0755dec892ffa914
+DIST kpat-18.04.3.tar.xz 3565116 BLAKE2B 3b61d26df58e6c502f45acdf3ece92d400301c6e8087fe00034d56f4acbbf047cb5ffe391345cde20b5ed69317cd703ecf1871c891e192e53d91eba73d6e4c8e SHA512 bd325d52faad7200d5aa1738cc539d8f285c4b9cb67e2f63837379fc89b4adb8873433df01392447e69546db04698b2f108613fe0a3001bf7c77dbda0bd73acf
diff --git a/kde-apps/kpat/kpat-18.04.2.ebuild b/kde-apps/kpat/kpat-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kpat/kpat-18.04.2.ebuild
rename to kde-apps/kpat/kpat-18.04.3.ebuild
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index f7f55525d99b..4598f6800984 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,2 +1,2 @@
 DIST kpimtextedit-17.12.3.tar.xz 141572 BLAKE2B 04c091748c8f4c5cfd9e57de3a1888d755aae2b9e6550f19738213cea21a487f65bcfcb5ff7e71dcce7a64a7c4a43b073442ef238541f090a108ac49f5760306 SHA512 0dd7891de260c2497ff0b44340a6a79994c512ad906db4bffe0217cff0fda11f27c86fcb89bd43a40668bcc8068b76b9287ad43de6a277909585b6b2737953cc
-DIST kpimtextedit-18.04.2.tar.xz 142924 BLAKE2B ce3fa43f24eadae1bad946506c603d37f72662eab20b41fbaefb3f1ca9ada1cb9da240083b782efb639ec0d9f4e00c6c1921c99c5c138881474585e623894a70 SHA512 609e925ae91744be5a91e06da5cf01ede0daa123711fa0fada8a5a3f4eb0b7cc205867b125adfdbb34f37b410a9783012b9864285be857ce74ef36ecb2b4a3c8
+DIST kpimtextedit-18.04.3.tar.xz 142880 BLAKE2B a8ff9679cf54f0445c4fea83ace27774dd801aea2ea11a29031fea906e35f22867cbcffec3e1541d45ec4dbfdc34dde0f508f2bc85d7439707a8b2be0dc0dece SHA512 e8cf0563a2c60bef0b82b0d60a025191c8660c783f262648bc0c9c9c17eb24b5c3c2a0d21159df60009256e920e8a649f06b22815ab051099ba4d6ef145d848e
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.04.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kpimtextedit/kpimtextedit-18.04.2.ebuild
rename to kde-apps/kpimtextedit/kpimtextedit-18.04.3.ebuild
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index f71b896031de..ac89a0deaabd 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,2 +1,2 @@
 DIST kqtquickcharts-17.12.3.tar.xz 25516 BLAKE2B 3f9e906bfbb6de0e70855e721b08b52f78be415b4b862a8aed8210c5c5f51648d01092151646231b3f6ef49c1d884c978fe2d9b74924d22f8f6198f8612031bc SHA512 496502071f079798ef61c7ff2542ad77f5cce505efc6492d18c998e017ab6eb2b0b4c6f7565511ba951ec21af45e6f0e45b58586d69ade3867ddf07e5e5de913
-DIST kqtquickcharts-18.04.2.tar.xz 25684 BLAKE2B 03594ba9bff548f2c5eab5c44fea4acc166d282de8f1ef8618a2953821565977425860df0f8d94e281d409d63c0c90532a8fa998cfba06a80837192205961b54 SHA512 e597d59aea53fcb2be8d4e9bc640c1ca72b5f40682a4700cdbabccba297c76693e5baf44f327f1bf70425033e38f751bad5187c4f300989104e0e9c007a883a5
+DIST kqtquickcharts-18.04.3.tar.xz 25688 BLAKE2B 617a448edc1f24ea0819f047cb4162f21cd4ce1ccefee9b57787df1879b010b06929b48117298f30c4d7208e278ab55253e028b48413248f9462ccec2d8888a8 SHA512 1569a64fdfa1ba95368976b25793c24b19a796b2a62e50942b0588368e5fab17df3dd6b0aadb774f32b64c1f71705264057781a2ce3b151fa3bf3f6444e2e8df
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.2.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kqtquickcharts/kqtquickcharts-18.04.2.ebuild
rename to kde-apps/kqtquickcharts/kqtquickcharts-18.04.3.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index fb0e245ff45a..21910246da9e 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,2 +1,2 @@
 DIST krdc-17.12.3.tar.xz 1554384 BLAKE2B 800a1365d3bf73573e0b36510531d215f7297b666805bb8a27a1a311e8125307e18d6d0b8d860c92e20bd4c81747a8aebb8ae8fd36a1034b15e32c10728d90a9 SHA512 aefd7f2ae3120482d9b85550eaa5ad5e771e4bd2663c0646d0256f95413ce27d45ee843a6dcc7ce5c6b33513e72983d528ac3e4e41e6a2eef61e094aaff2b82a
-DIST krdc-18.04.2.tar.xz 1553904 BLAKE2B 9054b4e4bd4e32d2d34b8126e43a0422af6aee9a325524d008a29bd2b22b3a2140bade037cd4202b66a9e2a8a3635176f60c477f163e357bf0180de22f501b32 SHA512 9e6cdf7c9c9555145edf46b3e009b2bf3e19a04e4ea3a57ddcfc010879b934025e58bcbd3c244a4693f98b895bcb400372fb98ac061e5d00c8be26bb1e8619fd
+DIST krdc-18.04.3.tar.xz 1553844 BLAKE2B 712f94ece355d7f5f16c2b94f058a93cc7461b1992d04ac54729e6b8ee8774dba86bc84f96563e18867a88c4ca76c57936ecf9b4dad92522000660555b0ebb4e SHA512 ee987c449b76abeaca909a3053ad41eace8a1890eff8cf05f6a2a83faa7707ad60e2c1c18cbd06268d4d9f0452a033574b26c2b38c29f463179c6a9fcde82e30
diff --git a/kde-apps/krdc/krdc-18.04.2.ebuild b/kde-apps/krdc/krdc-18.04.3.ebuild
similarity index 100%
rename from kde-apps/krdc/krdc-18.04.2.ebuild
rename to kde-apps/krdc/krdc-18.04.3.ebuild
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index b1f1c2fd9e46..1746c7300310 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,2 +1,2 @@
 DIST kreversi-17.12.3.tar.xz 913036 BLAKE2B c76b01192e3ca636306007e5b3014d4af20f38f98403f337af2cc72ffa076b76ff6bf5f9ffb4c1e4b7145a6f48528076848572d93837e1f9496968bdc90156da SHA512 dfc0cc5d4b49375754a1928cd45d87bfe4b6d18e62766828bd3ada8bdec017df12f51d18e432980449879f4fd321c38c75fa5a2c3919397f1363860d5d52559e
-DIST kreversi-18.04.2.tar.xz 913760 BLAKE2B 8e202827c65c085252f8995a16d537145ff4df3b713e6c7cb1d2e6801a188a400647d50f614e1544e6330857fd4e95c0c33a0a3e468f34bada199574374d4b6a SHA512 a32f2f246a3b879704e004355dd2c3fc2b83f2b89f756af3de0e7328304ab3ce0cd814add0d7624b6a9ff7c21c09284ede9cd0642b7da43596a5138c8bfc1a6c
+DIST kreversi-18.04.3.tar.xz 913708 BLAKE2B c489932a6edb2e7dca4b249109a830d57f54d32e264315410599300c5d7cf6b2b5dcc8519050fc2673934cceafb28455204cc96f3acd28aa5844701ae3c43714 SHA512 b5c104e23b1dc26d3e074b3b1f5863f8a937e5a4c6be3344defbbf5f43226b61a666a1cc7b967dfea36b44386a56e58f8953185477972698c37667d2c583bd21
diff --git a/kde-apps/kreversi/kreversi-18.04.2.ebuild b/kde-apps/kreversi/kreversi-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kreversi/kreversi-18.04.2.ebuild
rename to kde-apps/kreversi/kreversi-18.04.3.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 2d738d973240..e98c912320ae 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,2 +1,2 @@
 DIST krfb-17.12.3.tar.xz 995712 BLAKE2B afe6fa51e0b44b96a2bb7f1da1cb5b35c901219d6f8d0a086ec5d73915aaee47dd039d2346649d0aa5aaee280239dec9a2be1c52a436c4caf2a7bb17fd5d4898 SHA512 934bbd9e6b92bf6e6a2b46ac7df03fae9bf2d604a0fe9e5420d16332576251e621caee1057b0e743a32cc38bb38b54ed95a6ef99bfc613754a5fe23e8f697a53
-DIST krfb-18.04.2.tar.xz 996280 BLAKE2B 12b56dc856265e54e9f5d103e1696387e00da5e34786e990bcdc0e2c16f4d4e293c62fbf9ae223c3ab740a563cb54515a031ed2a4630f87843e56cbf76da1794 SHA512 b74bcb914bd65e26e8c8dce14ab788038c4332c44378ab5852dc4663906f6b26e5cbd4fb48a1dbba03ef12329c9c41a0807fb91361784816cf81d4cde1d4706f
+DIST krfb-18.04.3.tar.xz 996132 BLAKE2B 00b13411d52ca0f7b96dddfaf0b0563aa8a89a92c38d0136fc687f6d79bb63e819a610aedeb58ff5c652eacf57effdbe2c538d116474f71b9d2e26e3f2c49198 SHA512 25ddd2a9a71266961a1f55f0e2442e67e6c4ebb45205903981857b3d24f82b1ba5edd34e7386b56b301a7c925a4498cb85213c543d74d5fca522619dcc107e8f
diff --git a/kde-apps/krfb/krfb-18.04.2.ebuild b/kde-apps/krfb/krfb-18.04.3.ebuild
similarity index 100%
rename from kde-apps/krfb/krfb-18.04.2.ebuild
rename to kde-apps/krfb/krfb-18.04.3.ebuild
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 2af6475085cf..7ea39b57b3f8 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,2 +1,2 @@
 DIST kross-interpreters-17.12.3.tar.xz 144424 BLAKE2B 0eec653e071c026e3485c33325d9656c271e59ec187c166f2440cac8095f6ada195ffdd07622d05a9a1be100b4c6b06265771b2245a3ea79b00a2b1c5ea21fc4 SHA512 2eb261cbf57c505766dbc1d7086350f8e93b0c4da804464488701444a650119350b6ffded93beaf9956ee5974701ddaa3354838341ade3d080877918c91c6c63
-DIST kross-interpreters-18.04.2.tar.xz 144868 BLAKE2B d0bde9315fe387a735a52b744853a151d2f137d9a6b661031120a0ea5b756f62cb91790c5d6f48bbb7660d5e7088cb39debd0c0a2fdda4903ae5360f9506226a SHA512 e385e7680c29ea778e09a0b99e28382dc3540798782a1a579def10644245e7e16339e29e91968ebd5516c5d953dbe3d8061b232aa0b647dbc0c60dcd87b655ca
+DIST kross-interpreters-18.04.3.tar.xz 144832 BLAKE2B e1d32ae2dec8c4ada9c69576cd0feaca79c641c8d50e6772a966c4e766fac1054ac226a6fa3cdd4fa30aa11a0f2b04dba424ed2e4617eead3e49f9e2f11b7104 SHA512 d5ff06870ef0fc7906dfde9e413ceb0321dfe40296ad08f0a7f74ef63b368b91179bb140d12c650e0bbceed0601c5d141d76497eb87c95ac4f1f523b523d1a4d
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.04.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kross-interpreters/kross-interpreters-18.04.2.ebuild
rename to kde-apps/kross-interpreters/kross-interpreters-18.04.3.ebuild
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 67d72f38bad0..75b178213e63 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,2 +1,2 @@
 DIST kruler-17.12.3.tar.xz 259608 BLAKE2B b79ef372469b76d5734aa758b18e570c9aaba410d24f76f80a97e64bf35e61d0ac578a37dba088eb2c2ad10a8a46d4a5b24376a36a5e5f770011d51cd7230990 SHA512 e505604e01916226401ce0bbaabe8660910ca6a3e4f0e7213312b1f889ea86023d394e7ef7f821f29251ea1b16d44e3f270298304aff2f65bb1b5a937eadf23f
-DIST kruler-18.04.2.tar.xz 296076 BLAKE2B 39769b3b19d16da1c7b427ad2ce98214e5e41c49dc5e4f4cdfcd4cf05044565093c4695acdb49f150ae34f1ee5143452625c5077a5c248ed09019aafcf75c74e SHA512 c75b225db11953169fb0c41b8f31a335cfc4e0fe4e4ad1342a96bafb4924f95ce0c46d16b12496a34ae0aa0b44c11d2a4bf555dfee46a453c8b4488bbb8e5ba8
+DIST kruler-18.04.3.tar.xz 296084 BLAKE2B 20281feecca79c90970b1452883a3603467fc6cfe3a69203194cf145e94a4adfd1523953d6b71a1122dbbdbe96b42b5a0c1a63c90bcbdcae31021a3b7b466b70 SHA512 0d1ff9656530e4496e18b4382bd73c5750b4b2ecfd677140a57c3e159687e56254790198f406898c140654f01288580fbe48d84531d24c53b629a7d2a87557c0
diff --git a/kde-apps/kruler/kruler-18.04.2.ebuild b/kde-apps/kruler/kruler-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kruler/kruler-18.04.2.ebuild
rename to kde-apps/kruler/kruler-18.04.3.ebuild
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 1e9cf9744925..584f1569e07c 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,2 +1,2 @@
 DIST kshisen-17.12.3.tar.xz 708896 BLAKE2B 736271af515dad98556f6003b7fef81be7a7d56ed4a76219b479370cfb064e53a19fc829ae3049bba8ac902d5a29ea77aad2ee70457ca540e38f41f7d9e2dacb SHA512 50599330d51f4a08de050b2f4af764f084c505a5de09e3044cba00b687d9daa81618c8d9526bc76e4ab3fb53fa84e28a2f1508b992a05e284240649cfc1a0b96
-DIST kshisen-18.04.2.tar.xz 710944 BLAKE2B e38547057bf0bd703cb4391344ee2d902c8e16a9693e25b598cd06299c83a90e238c72672b060f82361e25e1455ea4592a556fa44c3e9607f3ff4934858f4424 SHA512 e1063494a4a08f4a2d54b83a3406993e54694d45e6d83eb3e242389953fe14ec87089f00825525fe98b777d58a9586e75db0912c7ac7d792a72c61c454c83191
+DIST kshisen-18.04.3.tar.xz 710776 BLAKE2B e9fc3a3ed41d68c85f1f4b0b0eb1f94521d6aff12158589ff1146642f854d4cf6b64f3944f443bf98843528639e3763a237b1e0da78511d412c6a91b9baf66b6 SHA512 87d7e86ac41fe179735afd20ca5186c659a8eeefa8b4973553f295ee712649a7bf05fa25b051583c4904d2b875816cb0175206b48febc48520f4ec548149081f
diff --git a/kde-apps/kshisen/kshisen-18.04.2.ebuild b/kde-apps/kshisen/kshisen-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kshisen/kshisen-18.04.2.ebuild
rename to kde-apps/kshisen/kshisen-18.04.3.ebuild
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 12435d755f75..03a84e103fe0 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,2 +1,2 @@
 DIST ksirk-17.12.3.tar.xz 6987416 BLAKE2B 280cfdbe3254d6ca6a63be411f1b96f2d892323fcc72b8800982461712d9e16b1a76f824c355e227db0d862fc8ebecdc73210275dd394b76aa1669cc2fe9e1b0 SHA512 dc18e40bd3db456dd5313365bc531c597ac4724b887465585ce4ac496c2086c078e059aaebc2e7f3e554fb3c51dd4b103e55017474020d5663209ffaf16aadce
-DIST ksirk-18.04.2.tar.xz 6984936 BLAKE2B 62903f2b4e26d0d5e1c297fd8ec764d7b108b59a6827fdeb49c55ab3bd3a7368cef22f7e31a7fcac5d9e7a9662338ef6f46a72b0ce88c376ce1ff8a89659370c SHA512 66cd8a19a2a3d70e96736895fb8ad7115a86b81ba7ba99a5444ac1f0085b17cc456f483492100ba629e943571a649882102c8653b74f62818262d2d93b23c5de
+DIST ksirk-18.04.3.tar.xz 6985888 BLAKE2B 965337f838aed03844fa43fb0b3740fb84f65615d9646757124516974a32248ea77861428dcecba8090c09f16ada6d58e7f401e504e03477d650698da675d268 SHA512 568b5d1abc51ee9b46fc35dfdac0a1e0bdf7e64f4640da751459bf81bb5f2ffabe5efb62462dee36630ef6b6e967bd2f1be822b2af739ba2bfa87b7d6d6013cd
diff --git a/kde-apps/ksirk/ksirk-18.04.2.ebuild b/kde-apps/ksirk/ksirk-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ksirk/ksirk-18.04.2.ebuild
rename to kde-apps/ksirk/ksirk-18.04.3.ebuild
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index fc534f1f0f11..b00187a188a7 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,2 +1,2 @@
 DIST ksmtp-17.12.3.tar.xz 38496 BLAKE2B 448a00e29c8bbd8143b5a18848aa6a1bf9bbc2f0b9270ff90c695e3b44c7fe6c055442cee685cb32259bd5fb9bc913ca0d302e68a3d600d0fadebb303fa7ff89 SHA512 9f11e39cfc7fc56a2e84b7a33ea832c3817069d8e91980bef936d3cffacbce320af1d31ead13b3d7db56953d6aa4bb0a91ffb28cbc6d2cd1d435bc9e077ea197
-DIST ksmtp-18.04.2.tar.xz 38092 BLAKE2B bd24a6df4c4600ceed1be2757521fe08048e3d9f144aee3a2ff4bf11b7a010cdcaffa6a989aac5917be04fd041eeef7bbd6d27f526e2fc605606d1258ed22b9d SHA512 d12124d564484a15862c92022e17ef94d3aeaeb8f3d44c79e9962f6712edcd8ab47de8af8433b76fdc3e568f03c95f59159a7d691aeaf4a26d8cf0683f74305f
+DIST ksmtp-18.04.3.tar.xz 38044 BLAKE2B fb35f06e63e05c82e958b0113356ef80cefdb2af19dda511ac4d8a5803dba12d31655080fb3f4ccfb357dd81ec5c88e3a486978c13e9bca705222361d737ea8f SHA512 b4149d8e6805e75f6de1e3e491859ae43aa596fd6ff59909f99d7deeefebe051ad34e1300f9879ea552f78d789e58e70f31f71e83f1aedb2e352ada4be302831
diff --git a/kde-apps/ksmtp/ksmtp-18.04.2.ebuild b/kde-apps/ksmtp/ksmtp-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ksmtp/ksmtp-18.04.2.ebuild
rename to kde-apps/ksmtp/ksmtp-18.04.3.ebuild
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 9c83b13477eb..3262a9e5e7c9 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,2 +1,2 @@
 DIST ksnakeduel-17.12.3.tar.xz 606008 BLAKE2B 5f0860f9b5c2848e7a4ce1b1b01c49df05280d5e7369b09fc7cc458aaab6f40c6f9414c19c44f9445bf8ec8a1be73191d8f9ec8a8981631d66f519d4919fcc4b SHA512 aed3e2f9744dc8b3a85aa3119a68f9a5081703a69c7f75394e23c9a5bb8308b4a2a2feabb6f404ecbabbc6e48fbbc7c38f592fd66a840a0628f416f0d724b4c8
-DIST ksnakeduel-18.04.2.tar.xz 605648 BLAKE2B 485ee456f1fe3b10c22c0f96574bd9b4be736842d4dac5be8ae929fdcfc7e2aa83a35400db7875ee47ba3c4ae757529cd15fff5c63a54453d816c3608965cf9d SHA512 01db3e2fbbbe2f7d6c1f9ea3190dade122ceaa005ea06b44ab135740a907b9c93a28a97133ad2e8041f95d6273a777233703dddb9dcf9a82859c6062c8ff3a0f
+DIST ksnakeduel-18.04.3.tar.xz 605444 BLAKE2B 4977fc37e1bb324ffb26c6d78cf537dad14c653b77b23b8ba7caffd613bd1db84392b7fbf648456dde25321b13533b42b925bc940c0c42efc9d9f890e025fe66 SHA512 04ccbba57d99aecbba962d45456f59b35195991653491550115e1f4d9909ca67ad55e2c5d603475334e795d8ee449fd5deb3f3aa60b319602d159af475b5a465
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.04.2.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ksnakeduel/ksnakeduel-18.04.2.ebuild
rename to kde-apps/ksnakeduel/ksnakeduel-18.04.3.ebuild
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 583a427fcf9d..ffdcd233eee2 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,2 +1,2 @@
 DIST kspaceduel-17.12.3.tar.xz 609992 BLAKE2B f50359fd07ca4580e4532e1797c8d7e0e083b16429aa1a8202a38c74c0a7dcbfd41104003497449572fa299b748c28598749d2e8dc4b50e997bdeabc272fccb0 SHA512 c4a9851ef9af9d9db4248800548a844e5ec64c0f368c5aac18efa2172155e2b7d10daa1c7f0e7bee3161faae20acd3b4a3a10dfdc75f197d07dc981a633752c3
-DIST kspaceduel-18.04.2.tar.xz 611224 BLAKE2B 930c2c02793f9d6b3a72c5b866701503adbd68de5d59576fce497586b6eaef1f9ba375bddb136af0258c8275d87a00fbb32764917bb310cd63a0d5ebed35eb05 SHA512 e3136df77f8006cbdb85078190687a34f1ee04c1865719b9d9bf5d36136299427e92243dc381a9cdc54b7b1eacee64bf6289be3ce1c2b91f82c399bea8f958d7
+DIST kspaceduel-18.04.3.tar.xz 611180 BLAKE2B b09aedb33f5d5fd56302459e31bc9d6c44e9c50e846665f0209e08eedfa37e80e653293d8235222d591b5c6c7aebd938d9f2c4902c4a87b466ea039616f3eb63 SHA512 aabed6df0c78ff7cecc2f2d3c8cf7803a4bb2c51cbc9482a964ec537808b016bb4d517d8af628d58a6bad60dac56312ff49c19b5bf1c8149486651c56174ab5f
diff --git a/kde-apps/kspaceduel/kspaceduel-18.04.2.ebuild b/kde-apps/kspaceduel/kspaceduel-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kspaceduel/kspaceduel-18.04.2.ebuild
rename to kde-apps/kspaceduel/kspaceduel-18.04.3.ebuild
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index bdaef6b93535..e3071135224f 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,2 +1,2 @@
 DIST ksquares-17.12.3.tar.xz 215668 BLAKE2B 779f1b9dd804b008fa14353fedabdde12ddccb003314b7d326d8606537fe71e3827f2cc4179140ed0dee067eb6445e6f90b532509542011d754ebf44f2a272bd SHA512 d22db7bf1563005c7ae1bb64bac77211be7c0ab0fba47832f91759a88814d5b4ed97f121156599f9203025657167f4f6ed542ecec7c64da3dcb7503216b9345f
-DIST ksquares-18.04.2.tar.xz 216836 BLAKE2B cb01cddee4e926b9b7846c2d12eaed43d92ba47fc9e6f10b7fd791fd27cd6bb8bc1a38551ae6bee0863b717e6cf33d285eb9079fd008df6058d876fe7acf0454 SHA512 46490de750f3409379d8d1618787a1540954fcf076652f96ca67a054b38db76007a88107322318b7b59bc14133b7601ec868e17d7db728d4d552bb92fe25c352
+DIST ksquares-18.04.3.tar.xz 216800 BLAKE2B 97d0f6c594bff6046a8faa9369c58466a92ee529f38c39a9732d0af6620b912c31e4b59d2a3c9f726e9dbe03876324dd1f3193692f550759bcf7614bdca545b1 SHA512 58b28c87321ad2380b95d58ca5969f5def22642bf3d073a4774acd036cc9d50489594feb0492d9e53c33744c0c7ffd3fc1243e475e00ac9ec6f96b9bf2c9f646
diff --git a/kde-apps/ksquares/ksquares-18.04.2.ebuild b/kde-apps/ksquares/ksquares-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ksquares/ksquares-18.04.2.ebuild
rename to kde-apps/ksquares/ksquares-18.04.3.ebuild
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 200e36abd38f..80b49dc51cba 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,2 +1,2 @@
 DIST ksudoku-17.12.3.tar.xz 1635656 BLAKE2B 19dc7c25d38db5b86b83abfe4a68b45ce0499e3ff8850649d9c9b4b77623662e57146011d8ba1dbdc2f8b06a19e3fa08a47873d51b677466aa1364dfae52be72 SHA512 4c35e01d793dd8358350378766b85f7567a91c18d9637aae7cfd752255fdf84cdc028c70ba32e7b0e71c6bbd4a2a1b06d04257524fca3ddb7dcc411ff983d841
-DIST ksudoku-18.04.2.tar.xz 1639064 BLAKE2B 495f35538d3e814de3e11f379003ad1b897eb140a8f132dbcfce1ba266d1e7d3b7482d805083440d9f5110e71f5235523e4973166a222fda847757aee1e0932e SHA512 ce5dcb8f08500f40a4d0acfab5bc17df60adb2c859ac9db2892569479eac62420a2a6a9a10d49a38b771437dc66bcf7d22179a7af018f1b7426d51bf48ca82ef
+DIST ksudoku-18.04.3.tar.xz 1639068 BLAKE2B 2627851afe3c1ad271f5c835c198cc449a5ec13f532043e9e0b9ee0f7ef3681506783e5ad85bd943730e7990c691f71ee3dcee8fa0d413cfb209031f276ea4bc SHA512 b205523e365c87badaa9c0b47f3228df2c678e89346329215c2a11cc652f92399d0a31edb09db992164e20addf44ba18c31b989b1d5b66b090138c656d4b32c4
diff --git a/kde-apps/ksudoku/ksudoku-18.04.2.ebuild b/kde-apps/ksudoku/ksudoku-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ksudoku/ksudoku-18.04.2.ebuild
rename to kde-apps/ksudoku/ksudoku-18.04.3.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 0cfaa2fea00b..d4e3f62b38b3 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,2 +1,2 @@
 DIST ksystemlog-17.12.3.tar.xz 1782044 BLAKE2B 0679e1f79edf65dc99958932d1e60cf4e5979d02786a97b0f5181a819b289ceb3dd219b4678dd84537df4fabec0560a6cf112fd55adb1155da2060b826acdd39 SHA512 b9f1a56a4ec0c26cae5556f3454d69fb7f186762affe95008ee4403071a42d1c76cc2b8451fdd19b3d0302fb0f2b1e7c8e04f84b0efae6fda3ceac90d83d9b61
-DIST ksystemlog-18.04.2.tar.xz 1784856 BLAKE2B db717c04762de5001b91fdd1faf45ccafad4240bcfada50852e4f00b65028afa55e70bf1c0a93b9e2577aad760a670e9889554b8e786ed4b8460cfcd89a5724a SHA512 c9d9bbc1c9cb6435aaec7236d6652e639e251709c8a70830c17b23bdf7597bce52bfc895533bc26cc06a0f6a7dc6155debbba30863086d8fea3ed4b6be0b6722
+DIST ksystemlog-18.04.3.tar.xz 1784680 BLAKE2B 27f71ffb37ab30311cb638f1ed03a1ff0a78c92117c0452f1797c0b01cc1c816763b6ecb7295f22118747ad85856b64399d04a02447ca4766cde598385ad3ff0 SHA512 f42d7fdabd93f98180077388ff4fc93921db562795edaa1892dd4526a8f8637a2f5ed5c063c0b97f96603a0f0f2f0425336c61b956c9ba933cec565fb2cad827
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.2.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ksystemlog/ksystemlog-18.04.2.ebuild
rename to kde-apps/ksystemlog/ksystemlog-18.04.3.ebuild
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 1a2fe35d0fbf..a31abd308da1 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,2 +1,2 @@
 DIST kteatime-17.12.3.tar.xz 297228 BLAKE2B 48bd8240ba9b8c5d31522ac5a5fa84483709f18c690b88af003c0534b70390a92c11c90c280b1021bb0e3ebc9e6b2191dbbd0ebe5f188e30b9d248d6222ce187 SHA512 658f08d6d11705d4bae1c458a44d1910ebd1297b6d245e3b866fc6355dad517081ca2feb6a33cd7e0629eaafcbf0d6007d94c54f1aea6bc4a45bd423c10f4f49
-DIST kteatime-18.04.2.tar.xz 298032 BLAKE2B 6a742323b261e159ed6c117b999fbaf4b8190ef47ca8a92fa3029fdca24dc4f45dc7a551a3dbc6e78d5754025aa91d58899042fbe32479e68dee4ebc0bbb6428 SHA512 3fbc93507ffd1a373b808bdc85c2fa130af458d865ba20d4ab281b8334867177cac1ee3cf08c033bed4e07fc561fd7c90461bde4849c3c0d35d1c92201521e58
+DIST kteatime-18.04.3.tar.xz 297864 BLAKE2B ca37f60362e8b4554bfe12c12e110fca5f1277a86fc2e43371e29cdf884ab3c76ff809ff325fc8ad6d7a2328d11a95370055ba6b8b4bbb80ff5389a881bb870b SHA512 5d6e19eac3687b1ecd0abeec1f6e0e28f69b78fe599e9d2cadca33a5f38b4565fe6a7abefc3877ff5a3b174a12d85c057c020d92318f311b7917466195e72961
diff --git a/kde-apps/kteatime/kteatime-18.04.2.ebuild b/kde-apps/kteatime/kteatime-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kteatime/kteatime-18.04.2.ebuild
rename to kde-apps/kteatime/kteatime-18.04.3.ebuild
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 026dfc5b2f05..25aa450c206f 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,2 +1,2 @@
 DIST ktimer-17.12.3.tar.xz 452056 BLAKE2B 2b1916d8b26232824296893d4ed0c9e3db510b8e6dda93a8b547fe83e490e2d646b7d6abddbf781730bc831c7aeaf05ae478658b85fe1395069fdce090f3b437 SHA512 89445386f152ce0960f0de9c84d50701d30811a526933c3bcc4441a29b5ee71cbf7e3f674b49ab8554f5e58e884f46a6727c66c60f273d52dec5d597e053df5f
-DIST ktimer-18.04.2.tar.xz 455708 BLAKE2B 95ea365773a19949b7479ded669c64300f6b77c361188220d9eb457840f2905715bd925722d8138c0096b29ad01d2f81009442d8da9495e2760360d48e44615d SHA512 8016afe5e8f9e276d8c1b046c2442f668f4c31e0d4a16e194a97c0daf019c8485f548bedd74cd51bd7df1b546746b7fe32e79f85e07d01cbf6dca15c0e3f6257
+DIST ktimer-18.04.3.tar.xz 456116 BLAKE2B 3a37fc65efe73991e30873fdc60a396966ae6e4f94d277b01b5119933d875648ce02121d3f81323c68fabfc8ff16eb7803c71898777030e85d15ba51ace6e2ec SHA512 d964f1751782ee112d91d59c66e8f5836751e41cb607d04d61eff4450c75dee44989a73cd484b651ec31b233e7242ab8ab8a39c29d175d20259a35dc54d02e56
diff --git a/kde-apps/ktimer/ktimer-18.04.2.ebuild b/kde-apps/ktimer/ktimer-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktimer/ktimer-18.04.2.ebuild
rename to kde-apps/ktimer/ktimer-18.04.3.ebuild
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index b1896b3dc0f5..0a4db2b5907f 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,2 +1,2 @@
 DIST ktouch-17.12.3.tar.xz 5105460 BLAKE2B 1878e633bd2aebe9f3da34a53d3ca868f1b1585c55bb0bfe6a05ac18788480caa3385ffc6f0249c0687aa0a44e65f4db4a69e75880550aa0f29b42b1bcc6d2f5 SHA512 6fb3f1ee7062331047aca2d44159bc47717cd0fdbf72e97a19e6bdf0fdd86df35f05405b724cdb0401c42b6a390eae7e9aaf26caddaa9f15e44c9ee7388b6c9e
-DIST ktouch-18.04.2.tar.xz 5110664 BLAKE2B c4e2d84602a1d69e33974b348c643f13e5c85d2d84872dfd2fc112a7a0642ecd7ac688c232061dd6bf4f7899bbc07e178791acde3d705c475d3c61f305037a03 SHA512 b09ddd8017313f0cf754e108bfdcf035b882d4f33d2a7581802760afcec1a90fd98d5fbc5f1d944e18a4b4e1a276a18406e6fbb4e65abecaa3715bcf8b9fc957
+DIST ktouch-18.04.3.tar.xz 5111132 BLAKE2B 36ded77fc81acc624f4c79aa8d9bce9e7df0718c8ef326ec2d03f8b70730a7629d715a681d96a8614f767649e794dee26a9ab378157cb6ef6dae84beca4a60d8 SHA512 eb27ecb18b9b06b839d56e150248e0ca89e12b89d80c1ba7237f46462e28056cdc423c1e3f3e9282b746f94c265d944dbc2cd4143dff1b145d6bdaf83d2e563d
diff --git a/kde-apps/ktouch/ktouch-18.04.2.ebuild b/kde-apps/ktouch/ktouch-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktouch/ktouch-18.04.2.ebuild
rename to kde-apps/ktouch/ktouch-18.04.3.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 610541ca1e4d..61f47217004f 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-accounts-kcm-17.12.3.tar.xz 262800 BLAKE2B 63db8496c2a21114ade346ae060b1ecea49faf8df101cc6ecb465ef0c5b856d54f6240dd7900f0917fb9729182b32c376634e6fdf29cd94c5e2d66e4d768fce5 SHA512 5cb33357fa974e383a288f7af4785b9d18e35445130a01a3062e127be4f01039a4f65e894cfc5fe2f0002cd8bd837b066be03e5e19f4fed89a8a0bef5436f43c
-DIST ktp-accounts-kcm-18.04.2.tar.xz 263812 BLAKE2B 05eaee4f514d2df75f7a7a2403220ebed6764b458f218c511c8d9ac6fbe56cd7e3b7435e09d05d58fe0c90eac2f118af80af09435e8441e4e8776f0253dee9d0 SHA512 ec0ae75618af3e1296e70b8f71ed123e8d737ba78a1bd9363f107bfb66cbcb0331b07b00449b44918925f787a576304693949bdb2391c783f14312705301b49b
+DIST ktp-accounts-kcm-18.04.3.tar.xz 264164 BLAKE2B 39f51d40b275b72e4ed3e38bb317fd9e3ede37c8fa1991c30b412938fb835dade8ff33c51256e3fd5cde4d325f780909f3d11d93420c21b3e20a4d1579c4dcb6 SHA512 410b9cc74abdb11287d633a7188970e7e12c21797da19e2a5595057c00e3311d916e3321475309cdad6492ae2bc6404439bc78b0e83d53702fa39dbdd7c39de7
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.2.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.2.ebuild
rename to kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.3.ebuild
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index edb5d5756eff..791e8410bac8 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-approver-17.12.3.tar.xz 37044 BLAKE2B 7c9f25572a3a1bd9d38adbfff60a161900d2a02fa1a02f95be2412f4ecc3682097f63dbe4b0b29a8f6e5cbe6a63be63f405e74012816dec21a8fdcea0625eb96 SHA512 30668c4ee3b03b11a4781b57f4c8ba9c596c4e965016522ed9d6bd579cf42f9cc394c36ae1c4035288a1821276a392094a6c6b9bbf4e0bd6f94c3e46546ca4e4
-DIST ktp-approver-18.04.2.tar.xz 37204 BLAKE2B 8c57df6f51ed0e12b9d387723d33748f1afa47ea9d7e5e5931384ea4730327b8d1876f3864e9d831d57ba7bad8eaf41e03c23bdcf8cd13feb0f58031fe3a5f6a SHA512 ab4b033527c3c5ef811d6bf50710508d7795976cf5203cf38794bb0adc3f0a011ce60b5fffd817d37b9b98c691989e121f667f177253d3a8274f9345254cce1d
+DIST ktp-approver-18.04.3.tar.xz 37088 BLAKE2B d3120dee367a2b9f3528a62ceece05d7aeceb824f0b6a9cbd66a255485e5227e424064d1dfdf83595f93f260e57dd8f0954fa086ccf74cf4764488e6f8cca42f SHA512 acc974de146cd6d5f803c34039d9db10c28c9e34775ef8194a65a2ace1da22108fb58756a630bf825e05a48ce43f477f9320ac93a710e69cb52e53f9bed855f2
diff --git a/kde-apps/ktp-approver/ktp-approver-18.04.2.ebuild b/kde-apps/ktp-approver/ktp-approver-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-approver/ktp-approver-18.04.2.ebuild
rename to kde-apps/ktp-approver/ktp-approver-18.04.3.ebuild
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index d3e53c2962b1..04591a690912 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-auth-handler-17.12.3.tar.xz 46260 BLAKE2B 22d2089a51776a0adc363422fe93b7a179f8c7fc143c42197ba8ed43e74c35b91558444f116d9527cd009235a670563ae73aac4a135c393da84a6083069584c6 SHA512 08b6a5e0b1a4ade40dd93ac8c515f4120e84e5251a7117c824194c47e35e30992e6afbd371c46ca8f29684caecb3f0e0ae26ab8d9c090019ca9c78336f24478a
-DIST ktp-auth-handler-18.04.2.tar.xz 46460 BLAKE2B 8e49918ea403190ac3b0fdfb609657a757c758ff57bac242bb68b69bfa258b92f0a2b35c76b8b0a950a3fb2fe68be3d4f0814139c661d53f09190476fb913d9b SHA512 1537a7ca292553a23769880ca536f53f7d1a58c5986d2743f6ce305621270b293787651ec610a2f8b30d3e8ba266dc042c6b16b680e8ee76cce88f2f8cebeec0
+DIST ktp-auth-handler-18.04.3.tar.xz 46356 BLAKE2B ccd7155b4ca8b42f26338d95cd4e8bac926bc1265857f9e7e748fb4ac1e327f1aa75db983bd656b45464a9e269c09f80b2649c74ee9c53660a11459cd91a7320 SHA512 1e674f484e445e244d7c70e43063ef6deccf50b4e75058bd290ca55d3ee792f9ac596ce570c16407a61fb97b87ae58077c5f9352a510541bd95231ed2cdddf52
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.2.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.2.ebuild
rename to kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.3.ebuild
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index c589dde7130a..e51f4d5ce5cc 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-call-ui-17.12.3.tar.xz 96532 BLAKE2B ed43fa92c5ccb10b831c3577a1a58f91195d50c3207b56e11911f0a153fea4705a5a2b99de950e40647730473dd53815333819cdc933bdb71d2fa7087a1bb5c7 SHA512 9fc96b1e83b95a2e6d2793631c94ff1092e72fdd78b700ed7d44bd1dfe7dd2c010ac86ab7baea1ddaad02c99cbf75b27f8d42da43867fe84d2d7dc245aef0ea4
-DIST ktp-call-ui-18.04.2.tar.xz 96808 BLAKE2B 731d92868ab3abf347d53be686ea8c1565f146ed93273f9a2a52d389f1d477da75e65f8711d05692090270cea87bb6878b7094124eef30cc9952b7c2a69648e1 SHA512 c80306e6ea15701d5a47e4e3557321ed823305c92deb34e7f5f56ff4dea408f1371fd10f984b7fb33daebd7dbe46fa9778500084280c07ad31803d54a3faa940
+DIST ktp-call-ui-18.04.3.tar.xz 97288 BLAKE2B e4b33af35f505bd03d4c0ae6509cba9f6c0ca63052b556bbe6dde46c637b8c81b1e2ba84a0337c81de84270b6031ab20754a667d454d6ee81eba04c4c6d308f8 SHA512 837252b0a788064b186423630178aff76e446a1c192b83dd06a70a4e6c22b39894763f524f9489c91767cddd05b61a2f46bc0d2ec48fb6f216cc9c4e6472588f
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.2.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-call-ui/ktp-call-ui-18.04.2.ebuild
rename to kde-apps/ktp-call-ui/ktp-call-ui-18.04.3.ebuild
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index f633af734112..95b7607eb8de 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-common-internals-17.12.3.tar.xz 441184 BLAKE2B 65b3e4e830e5d90f9318d160ddb3ec239772a840973464b95c0b6dba1e753a5a12120896a31aa9d6663adfc235591181adb4b0f938a3a56f7f18d63ff4e1146c SHA512 7662017f3186ed0b70dc02a6af33b0f0f5547c2a3da5f76855cbdaa7ce8bdc31cc43929033b040cd1d7bea0b9606dfb440ee93a8ce5d0f9835363775b95c9cf1
-DIST ktp-common-internals-18.04.2.tar.xz 442460 BLAKE2B 87864878120b49250380abde84a55be3c4f1c15096c7fd8232ae5f8dfd31163b4f67f65016556ef6f4d4d1ceb1d8a4bfb3477ab7ad20f27135f19c23e3b7d51d SHA512 4a24164a187997d8dba5fd055b7e6c288296e630b45e0078d6ba2f0a115fecd60fa52293515d535ab3699755552fcba73eab5fe58692fb6ce3298ee40e225e03
+DIST ktp-common-internals-18.04.3.tar.xz 443664 BLAKE2B 2c66f2a401981675b8b393a2de2928cacaa6f1929b3f5aef5cff681a9b6abc30de8234447c35cf4a33fa51981785241848a4d161a153a98b9db2e300c849f15a SHA512 b405fa103fab1a366497ab19d5fc60bb8d939bde2119e50e43e240fa7066b5cee5647396b1b4ba246c9c82bf5bc876481c8ca586400613a410fae08735b120f9
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.2.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-common-internals/ktp-common-internals-18.04.2.ebuild
rename to kde-apps/ktp-common-internals/ktp-common-internals-18.04.3.ebuild
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index ac02709000b5..c7fcd3386ecc 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-contact-list-17.12.3.tar.xz 131508 BLAKE2B 55f46331693029939137067e98d252cf6b8efc816b96e597042c2adbaec3bbefdfe5bf027ffda47d9ece869285107425da27661f2b5d0bc63c438843bffdabfc SHA512 4ceaad321e180a121ed8dc10001932c070042544fbab6df1716d882ff429a51615fa3d97615c443141f0e709eb78aee6a013a2e36159d500494bd406761c8983
-DIST ktp-contact-list-18.04.2.tar.xz 146660 BLAKE2B b1b22b821e89c8f8eb8474ccb22bd92e834921b79e0957a6f322949ce32f65cbdc56ce2e7455b913ffeb8f11d675f317e18d456aa7fa5e13ca765344e9a72d78 SHA512 484a6ea50c2c67039da296714458daa2c7388a789030e09436b6aa7317682a06cef5bb6ce268b7dbda231c0a04f28f202a100b432d805a6841cf8c5963427b27
+DIST ktp-contact-list-18.04.3.tar.xz 146956 BLAKE2B a0eef7d446ec629d3b5c409dce828eae70e248e43013abe22981036698e2695884074fc916366a6fbf23854abf02721be2cca094067eecd0c87e1d19e3de4b5c SHA512 17fb11cea4f20e529f6d9b27c1d79a5d4a876d6fe2a5c240b7aff36793637aec227e23caf3b37ff247017b20244266be2d7a7f67fb4b5bd0dd1e1672ab2276cd
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.2.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-contact-list/ktp-contact-list-18.04.2.ebuild
rename to kde-apps/ktp-contact-list/ktp-contact-list-18.04.3.ebuild
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 7261c653caa4..ae3723124344 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-contact-runner-17.12.3.tar.xz 40100 BLAKE2B a328c6f8af07e2d7a3d1bacad077fe83e39d412ad1517feda7a1f0f17aed45fd503e22fa3064cf57e3687c572b1dde4a99df48e36405ba1662edbab33614f5c5 SHA512 b2ebd74bc9dfd893867fca624a1e4ccb2b999b27b87c2f460735fd0c1e7d9627765d012cd901a9db1d5d6df79a587da3d2457d7a2afd504eae8b41cc9917cf9f
-DIST ktp-contact-runner-18.04.2.tar.xz 42588 BLAKE2B 33dff45c643289fa564ebd0cee149821de57dcfb8cec83b409c548c69e89a31f9f0fd49fbe0d89ddb3270be5444a90c7bc6fd72284e0f88f3827114c6aeef72d SHA512 39aa1e0fe4ef9029b4fa3bb3a3634af4d99859b118f4294b0400aa71770535c7563f671b8e04ca7fbaccb65aba9a2c7824c126f8ac3f001d25a337f4b4da8b65
+DIST ktp-contact-runner-18.04.3.tar.xz 42700 BLAKE2B bedc758583266aea0a4ab31b532eb835c0b13cf7eea8b369dfbd7b24b9f76d9bad98e5ba936759d5f3f9e0f653b35e84335d10aa47a82613f1b02e89dd43105f SHA512 7b775570a4179b4a97c162e0e2b3b76f932394d527809ccdbf6bc2a0f1e4d700c2281a768145ed3a90ff7ce25430a267ad1bf4f9d7857a8b1de3d7a94bcea93e
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.2.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.2.ebuild
rename to kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.3.ebuild
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 7a9e27837d3a..6d34009d7a4d 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-desktop-applets-17.12.3.tar.xz 43220 BLAKE2B c1d783c2c10481e4eda0e18cabe6598d8ee5fb0342f3d3b23f75916c66b2bebe6e43ac330fb224b1380d8fdfa746ed458e447b1525b3b23ad15a6ed2d4f8d1d5 SHA512 e6f1edace6b543c56b85b79f421c0023d28495c5dbf6d821f729970161a8d097faa03433051f385117d4b0968c4d877ecc5b0134b94feddb73a577763de63a3a
-DIST ktp-desktop-applets-18.04.2.tar.xz 43216 BLAKE2B 70b426a2c49cec2424a46d5fda7f610e74a64e777eedab9fddd8a929657d48e7a465d2be9d837e259f628c157a9c12bcb9810feafddc35195f40b5b3efa17dce SHA512 0060adc9e5fb15b1d6c7f49b825dd4164812db757055a2677c3c315ab417a49860eded241011fe3f92ec28a07b85d1dd609e83bcf441bc0767eebb51e9832cb1
+DIST ktp-desktop-applets-18.04.3.tar.xz 43124 BLAKE2B 53af20f4e3a1a51aa09b3dd8061b16ad964ddf6efec4bb7982212e7312bd2cc07cdf5265e29e900e7e2aaeb77ba8132031ff331a0b5090f6f20819655a7a8f14 SHA512 865f8f983f7434f32fa8d598c815454ff7cebce935fe9a72e35173b5e560aeb91f380e6cf60441f57eca7251b5fdecf8b5e7d0fceef289136fb91dc01750eeb6
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.2.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.2.ebuild
rename to kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.3.ebuild
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 49b623f18bd2..d7935b2781a1 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-filetransfer-handler-17.12.3.tar.xz 45968 BLAKE2B d982a94ec787124d5d6df5284a1effdeb58c4f1dd15e7a9bfd6e017f8acc172becbfe83162b9769ee12a3617d1dc7348efde4e563f95e771976cbb58d3d1cfc8 SHA512 145b3616523c224b479107b94de6b267151a9e6b12a412a86abf8da7a1f0b18fdb88783167149e84641532fe4ebf5105d64976155561f3ce7d23139ef58825c3
-DIST ktp-filetransfer-handler-18.04.2.tar.xz 46108 BLAKE2B f450e5e03776c8ca7969bf4ce15637bdafc9a937f1690d8addd5f79db65ed7c164c651a10f1de8143f8e45c189c3d3e725baf3c8086349e51c1199c65d62954c SHA512 7ae81e983e50e877ba6629e24d0eeac3cb557e16bcff5d8c6d8bc95b07884c9db0a3912096a2612de51f22baaf4635e3349b8b65f082ac3e39c8f291131e34e3
+DIST ktp-filetransfer-handler-18.04.3.tar.xz 46224 BLAKE2B e3882799897df59030f3fdc841c5495735c1531cf09ec4e98629e450d77721296c2cd28a4357411b0e13ce2faf2631fcb75c93c2ca2a0bb71899ed68adbbc6b2 SHA512 61410a03d2da650f2d92dc734e35546d47c39818273be6a49057570f2ecfbd06d58b67d05a88f5e8df7ad0b34e608d8dab64d1aec716d7db8d699d68de190204
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.2.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.2.ebuild
rename to kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.3.ebuild
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index acd1b6b34ae9..61e7c06fa8b1 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-kded-module-17.12.3.tar.xz 81256 BLAKE2B 690a858e80614ecb1f3fa465361010d846acb73c4a92d9355735cc6cde97648894182a11065aae28954f093a09e4e950ff5e104f0b6675caadae79126ddcf913 SHA512 0d804705662ed87fe56217e603ade5b0ad28b3dc852a7f6fb005c42b033464ae92f866ef00e52e80cdb67c2e107d94f104f3e0b7ce7bb7660cc4555f4e414d57
-DIST ktp-kded-module-18.04.2.tar.xz 93412 BLAKE2B b72d916c3cf863ee14a6cbb582fc799cc7eae45b6602e609defc18420b5f481f34add39b000e15ac5c98fd1b17055ee51d90a24c2c2fd5c7933b158143c59c36 SHA512 861e51c14dc282779cf2cb7f675731d9158dd8b479d8d876629c998255b0ac1b750ff7bb6571c0f48641d6cdecb11737af4d1cb5363f334cd1460ddcbd97ee78
+DIST ktp-kded-module-18.04.3.tar.xz 94540 BLAKE2B 7c6119a638ae191407ff6ce8250365e177a7fe3c48edc1a8a20facdc7c8c79f7d10d68d1fe0bd587b433f76ba4a617ada28bbf59d90351553a12267f6cd552e2 SHA512 8fa78a3af4a17e345ec6e4c096ba86646cde8e4b67be847cb61ca3d470fadbfdbabdc24d3c4c61fb4a9f98817ab02c5d963b382b9747c79748110f1e24022fe9
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.2.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-kded-module/ktp-kded-module-18.04.2.ebuild
rename to kde-apps/ktp-kded-module/ktp-kded-module-18.04.3.ebuild
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 5aa6a01db0a7..08e2ad87b10b 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-send-file-17.12.3.tar.xz 28820 BLAKE2B 267abc501fa4d2890e5c530ed7df132cad2a56800d3008f72dd3599779e1ba34c14f82635991bd43035af25087ec2c36dd14c79384819a01c2f9e4d3a7050f95 SHA512 887a7d4008f77fbc48355c32e4716f164df77c901ba4bf7eb0b0305e83b03e3e8fd38e7b5381532e3037f42b60055e65c4b49e1510799000c3951c67ee2a0ef5
-DIST ktp-send-file-18.04.2.tar.xz 28864 BLAKE2B fb86ad5b94dc282c497c0e3e27089db3cf593c7553d484a72f8705efcbaa6b79246a48d4ce0873229fef40b2cae4f5d5b0d9e42ba322327f5fe05baddcf4ee76 SHA512 c4f862048cc2b60ff40d2e496a3780551748a662c73fefda2a3913dcae0a22fc06f1e34e1c171cd0997ed4cc336b31025db190ce0b93d1302d605c78b2dcb633
+DIST ktp-send-file-18.04.3.tar.xz 28800 BLAKE2B 8bc11189a37537c073338c84792374919242e64738440f63cd47ffde61a1b8764c3b8487054e307b810199b62c406ac559717e39661d5a125d88265eb64f94c0 SHA512 a0644f8d0e8bd71ff29a60895f2e28fbf9dd80f82f208930fc816b358c953009bdfb8052359900476446129f1bae4be71b125cd50f335b432c8857b396686fc4
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.04.2.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-send-file/ktp-send-file-18.04.2.ebuild
rename to kde-apps/ktp-send-file/ktp-send-file-18.04.3.ebuild
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index b5f63792cdf3..e5be2bee250e 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,2 +1,2 @@
 DIST ktp-text-ui-17.12.3.tar.xz 468592 BLAKE2B d4a4aadce200e67f40ec16382902f386ff06bc14bcbc0b91fd7ad0193eaf31e9bf7b1e8fefdf80dbf1cbd6e3e100a61fefcfcf1a67d4dd578f2191760877519b SHA512 2ae0dbfac8f23e478cf208be610cb2d5b73648b1bda43af75f4fa33dcbdb00a5342a19c4b2b6cd8c5a59a07ec6ca3a8d3d8d95cbc42d24c4b74ff40ee22b427f
-DIST ktp-text-ui-18.04.2.tar.xz 469676 BLAKE2B ddf66e51bb1835e9d0acb531518baae84107be90db350c93ebeea59bb884c63591f187a401c2c6eebc857d29d73256aa793dd7fb3821c133271b4f191cbf2370 SHA512 1c23b7967370e367f453b02a51d43ba0a79e5b6ccdffb2eb6ac7f9d04f2cd01ef9aa9e5566fee7ea188c1c5fd294c25764cebf91517954b704c08dde32ff9ae0
+DIST ktp-text-ui-18.04.3.tar.xz 469688 BLAKE2B c1e43957d1ae541eb3371bbcef1da2d876e00f6db932861ca8154d448c134f05a9a4b2de1fc2efe791bddb7bdb0aab4dcf5409ba7f502fc07540bc4ec05d6d51 SHA512 b4b620d3a25307c027cca61fc3b814bb6f511feb10ae3baab176a9c0f86a4bb7101dc278b278dbaeb0d6556bd6fd7c42db3ac96c64178ee5c6db3ce47740c519
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.2.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktp-text-ui/ktp-text-ui-18.04.2.ebuild
rename to kde-apps/ktp-text-ui/ktp-text-ui-18.04.3.ebuild
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 8f49b6987f86..18e08a1800e3 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,2 +1,2 @@
 DIST ktuberling-17.12.3.tar.xz 32802036 BLAKE2B b80c4fcf37315889270de1e9cbef3ce70817b6823a5f20305d05e4213be0714d3a6fb575c388d77fc264b32acf9458e1317bd29ca4021cdb9524b13bde0a76da SHA512 f92d1f97c725bbe45e2590b3873978a321fc5fc78930e21f98274ec34eb665d71542a3451e7970c964e5f3cd7a615f472f6e4f5656562f6c349d45807ed2bda1
-DIST ktuberling-18.04.2.tar.xz 32794900 BLAKE2B 93404f7421d37c10cfa1511dcb9f798c78f8f91a3333d60e5e240c3fd91124b4df29250665546b4ddebd6b570c18575f72189eb15648a16619bc7d01f1f5aea2 SHA512 2c2b1160fde97efb8dfc0c319f0d2ec0e0e338b6af04ba71e22afcd3225900c68d41f442b2da6c02628ba8706871ba356333d635cdfb87b16d16da358355e025
+DIST ktuberling-18.04.3.tar.xz 32797016 BLAKE2B 92d52365bf712d45fd2a6195eb5e9072de5427952ae7b268de352acc85b5cc25509891835c5ded1bbb8d81b743ffcdf589a2dc16956ef68a6854f7c14d0ffac4 SHA512 7f8e26b681389d50194d85c08a88abce6d96acecf8b668e966eb4a61bb9129f9d9ebd667e3021eb83f681bdf5476a0c60fdd4716f083456be5b5d0e24c9a57d6
diff --git a/kde-apps/ktuberling/ktuberling-18.04.2.ebuild b/kde-apps/ktuberling/ktuberling-18.04.3.ebuild
similarity index 100%
rename from kde-apps/ktuberling/ktuberling-18.04.2.ebuild
rename to kde-apps/ktuberling/ktuberling-18.04.3.ebuild
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index f2fb4544b309..273ae635fe08 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,2 +1,2 @@
 DIST kturtle-17.12.3.tar.xz 1608852 BLAKE2B 1f8fa96742f08bb3e9ff4be1c6b2f1cc9bae22acf9e54f69a19a74f621fae9cf55bad26f4baee1313e03ea3a575b21f5d45d66541f712c128b823718fcc7936f SHA512 5510621296a824cdedd2454cbda21e5eb906bb72a79addae5ccb19d011af813c29c7702166bd2e4b728a3cd1d62589842b44983af01af10d3f6a13536afcff2e
-DIST kturtle-18.04.2.tar.xz 1608920 BLAKE2B 3e5d131a97eeff97bad5666cb8e9a96adb8fc3ef70761f6ff12b3766a97d34909b2576cd05cbf27f4474e6449d6bc05e1bed18dd37e1f8ab1b396a2811b84fc8 SHA512 084801ca4c89d84f326608ecf7e6084d105aadd439e7a705b34e557b0b16dd339d42eb2ecb825757e4b7481bb5c263cbcc3afe1ad264600e505c88df30a4a065
+DIST kturtle-18.04.3.tar.xz 1608732 BLAKE2B dbf1c0ccf1b4c0efeae57d0c538b9bc43e2ce82b689fa862e7beece84a504276eb3ef7c41c8d8ee46d156dfde537d13cc804438903590490099860e80e5c5b82 SHA512 c4d3a20b7a399f4ffd2e8ed6975df6732fe33fe945694a8eb94410c2d80923f3156d7cae1658edbfb48692ebf86fd19c17040d8fbda877c86d12e939eba98ec6
diff --git a/kde-apps/kturtle/kturtle-18.04.2.ebuild b/kde-apps/kturtle/kturtle-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kturtle/kturtle-18.04.2.ebuild
rename to kde-apps/kturtle/kturtle-18.04.3.ebuild
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index d763174443cf..b132ca8313be 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,2 +1,2 @@
 DIST kubrick-17.12.3.tar.xz 307056 BLAKE2B 737e97392692bc9aa7e1ba67d1cc04e370824932248586ab1a6a04afe4f4a3f4feea6e8dc86a4f39e56714bb01781c637d466d6eea6c950d22146d61b7fedc1d SHA512 4aaa118514674458513ffc8b4ce0d5cad479d33103302979e2a9ee6f9ed7955147dd42d8f31ba73a6ad39e1050ffbd48f85d8eab6954bad834fbf1e6b92f39d6
-DIST kubrick-18.04.2.tar.xz 308348 BLAKE2B 778f4e9b87a4df5e9093924ef068f4854a9306189096ea329967e517399f83a62ac1498a32d93cbb41ba339db7dd8f209d9b7ae9e1e70cad1466a244ddb0aa22 SHA512 f4f467e95f46b8b2677ce2f4cf5c5836a3877e5aa79ead65e0117091cf98a75831c3d124839a1f3a6a0a12724909c70e56a4842f2ca8bf4d6589d68faddf8314
+DIST kubrick-18.04.3.tar.xz 308328 BLAKE2B 544061d358993a7f924440b1aa1b33fc53fbcbb331c66072fc44c5a5d8ce7f29c8737cf1f613e43692271b1984a72b236ab53d3f6e942e7f3d991f83cd024e46 SHA512 a2bc2bb76150a60b7e85173899eb112eeddc91748c412bd2f2281d72ca83a6b418edfb693d4468de125ddffff280a9bebd3412bda0a331b17ce494c0b5610d57
diff --git a/kde-apps/kubrick/kubrick-18.04.2.ebuild b/kde-apps/kubrick/kubrick-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kubrick/kubrick-18.04.2.ebuild
rename to kde-apps/kubrick/kubrick-18.04.3.ebuild
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index c081ceac5240..4acecebdd8be 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,2 +1,2 @@
 DIST kwalletmanager-17.12.3.tar.xz 778500 BLAKE2B 106e4cae3ec45f1782f838dc7fdf6722ebf766120ca922c6ff49a469afe09c48ff2dd81607094864a56f69355408b292e5dfa68138375bf1b2e48415f9227766 SHA512 b06bd097c580dc70d51388a12f30bd0ff0460d6dec5789333e460037ee3d132886e004c1fb1cdb13add6e588bce554d72b5cfb33bffa205b0edfebcf074610ac
-DIST kwalletmanager-18.04.2.tar.xz 779268 BLAKE2B 0181a9e4d9ecb35dd839b793e01716f54adba70430595d08760a850555616e9b11f165d7d8e80d4469ce815f7889a552cb5fd854fd84d40c1fbafb2beab4eaea SHA512 1dcfcc854ba3651bd9a6bbf549c435f87881236bae33c5f2bf192b59aa36de3bb3952fa75d5e17bccdf9b2a908aba9af2b9cf7130e95626667e63adbca5ccabf
+DIST kwalletmanager-18.04.3.tar.xz 779004 BLAKE2B 7220e472946cd61e1b7ef882e3e8cc92e285d5fa5696a5d4e9703e5077ff9ee70fc68f78b662a952a1d733ea2ca3a7f7c1d482ed728b6e3ff6d772124bd25917 SHA512 54cc68ad34419703092cc53fdfe19e48ab758377b47feae405d2a094950501195cb8a39ce863d37204b0d2a0019100411ad73164c00bbf1e96bc2662a9a79b44
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.04.2.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kwalletmanager/kwalletmanager-18.04.2.ebuild
rename to kde-apps/kwalletmanager/kwalletmanager-18.04.3.ebuild
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index dc780bfb75b2..5556da6ea068 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,2 +1,2 @@
 DIST kwave-17.12.3.tar.xz 4757724 BLAKE2B 1479b75aada209ec45fc69a735f789512f8c81177a469e7f87f55e8063f8bf2421b7c901aae0886f6aff238ff6ed9acec2b872fa61d596d30251745ca5553619 SHA512 008df107d05c5e9d07a9b8f64ad261a03bfdca64c8ffc098be6838a4672bce2d0c00f9fe4afe07cd7418390e0973720c0bcc1703ac4ab8fb5e0bbd5fee9fb503
-DIST kwave-18.04.2.tar.xz 4762332 BLAKE2B 96ca5858ddadb2be5859080e87519c664049ffee1608b09be2ab93529a5031cf86df1de3e47c8c721efa03fe9ade7101df19887dda02e071b102294009a7a140 SHA512 6ce691b2d12f6abe8d1269985d630eb077a63eb8c3f3b77ba028ada9b11d858ae592ad3411c172726d933096951c1ae2af00448973c401000c228e47e1ac41ed
+DIST kwave-18.04.3.tar.xz 6186388 BLAKE2B 4c6d4c9d2beeacee09535930e5660cde084105a9bed21ef4df400fbe8f5b0ccbdc5eb0152f08a92bbe60b7eb164b268964f6b386af0740677d99c2f1abe2dc9f SHA512 30fdfdf681bdf2f339a0b8ca91899e4b3e447075a7454f352f897745af2b671a5412c37ff372563a5f80cb3545295a5c4849b3243386ab86831e325867f7ef23
diff --git a/kde-apps/kwave/kwave-18.04.2.ebuild b/kde-apps/kwave/kwave-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kwave/kwave-18.04.2.ebuild
rename to kde-apps/kwave/kwave-18.04.3.ebuild
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 9c34eb28dee6..111fbecb93c2 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,2 +1,2 @@
 DIST kwordquiz-17.12.3.tar.xz 4168956 BLAKE2B ae201895e4b04e692af562a4adff052f2d6c6897cd7e441f17a1c4613d0a5094fd34d2ab842f4d0661fca35b1a5512b1906ef54179ce22e135d4a0a196c281d9 SHA512 b07d8673c14752ebf38e4ff18771189a701f52435b4c565e4355f48246eb81660f2d0d6d5beb22ca19774e1ec6c0495cf203dcb0e5634609f7f021751e64f561
-DIST kwordquiz-18.04.2.tar.xz 4168848 BLAKE2B b930989cb231f21d0fc08e721d8f0e02b6d73bf6e101d95b29f10161634066ee3f6c5fb1c6a4212dbba16c25b3f7e2b82b9ecc075bc02b783ae7b72c0d6df965 SHA512 8e277ac2c672addd44ab1ab2d9ba3f6fb856d0fbad6a9c615b063c029c7673e52439e2bcc92dd64f0f8f3f83060d59ee7bbd5112c36b2f0b402ec737cf91ddd8
+DIST kwordquiz-18.04.3.tar.xz 4168840 BLAKE2B 4bbdcc0119f31a5645e6c77e2d4c4bb424ff6572dc8e0192cf26972761ceef2b2fcf9d03b3453bd4f254148a77c3157465c7a137ab0d10d8fc1f8a57adc6146f SHA512 9b8fe36ebaecd49bea700fe74338aef430a2d0f9449eef4c3b1ca3ef84915e49e1fa22a8aa4fd72786cbf0631cbb39477170b0b5ba4e5f713722dd591b55fb55
diff --git a/kde-apps/kwordquiz/kwordquiz-18.04.2.ebuild b/kde-apps/kwordquiz/kwordquiz-18.04.3.ebuild
similarity index 100%
rename from kde-apps/kwordquiz/kwordquiz-18.04.2.ebuild
rename to kde-apps/kwordquiz/kwordquiz-18.04.3.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 590532f0bb5b..0b4f8bb23fc2 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,2 +1,2 @@
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
-DIST kate-18.04.2.tar.xz 5641048 BLAKE2B 7385aaf26029a6c5b1e749440f41d8ed58e936a06fff9c40ff1b37fd5724298d49d7aa92eb3bdefb2b4088a6cbe106cf6f5796e2a410c2f348c9b42492c7ac7d SHA512 2b3545ba3042f95756f7f3af2d423041107860d390ab6884b52f410adc0a66c8e9fe85e0105935258c0a68daa41c96330ca78de2aa788685daa2b51d97afea7e
+DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
diff --git a/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch b/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch
new file mode 100644
index 000000000000..5bbf2da605ea
--- /dev/null
+++ b/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch
@@ -0,0 +1,62 @@
+From bf6d5b7532968763bdc629aa90426c53500af13f Mon Sep 17 00:00:00 2001
+From: Nathaniel Graham <nate@kde.org>
+Date: Sat, 26 May 2018 14:50:24 -0600
+Subject: Re-allow running Kate and KWrite as the actual root user (but still
+ not using sudo)
+
+Summary:
+The original change (9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e) to prevent sudo usage broke the use case of running KWrite or Kate while logged in as the actual `root` user with a GUI session. This is how the Kali distro is set up by default, so the original change amounted to making Kate and KWrite not launch at all on this KDE distro.
+
+This patch re-enables running as the actual root user, but keeps blocking usage via `sudo` or `kdesu`. There are no negative security implications associated with re-allowing usage via the root user, since if you're running a GUI session, you were already exposed to the original security threat and Kate and KWrite do not increase the attack surface.
+
+I have submitted a similar change for Dolphin that has been accepted (D12795), but @elvisangelaccio wants that to go in at the same time as this, to keep them in sync.
+
+BUG: 387973
+FIXED-IN: 18.08.0
+
+Test Plan:
+- Log in as normal user and run `sudo kate` or `sudo kwrite`: you get an error message.
+- Log in as normal user and run `kdesu kate` or `kdesu kwrite`: you get an error message.
+- Log in as the root user and run Kate or KWrite normally: it works.
+
+Reviewers: #kate, dhaumann, cullmann, #ktexteditor
+
+Reviewed By: #kate, dhaumann, #ktexteditor
+
+Subscribers: kwrite-devel, elvisangelaccio
+
+Tags: #kate
+
+Differential Revision: https://phabricator.kde.org/D13138
+---
+ kwrite/main.cpp | 14 ++++++++------
+ 2 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/kwrite/main.cpp b/kwrite/main.cpp
+index 62f4f2d..d3f3ca9 100644
+--- a/kwrite/main.cpp
++++ b/kwrite/main.cpp
+@@ -50,13 +50,15 @@
+ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    /**
+-     * Check whether we are running as root
+-     **/
++    // Prohibit using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+-        std::cout << "Executing KWrite as root is not possible. To edit files as root use:" << std::endl;
+-        std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl;
+-        return 0;
++        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
++            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
++            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        }
+     }
+ #endif
+     /**
+-- 
+cgit v0.11.2
diff --git a/kde-apps/kwrite/kwrite-18.04.2.ebuild b/kde-apps/kwrite/kwrite-18.04.2.ebuild
deleted file mode 100644
index 40a36cff18e3..000000000000
--- a/kde-apps/kwrite/kwrite-18.04.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kate"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwrite/kwrite-18.04.3.ebuild b/kde-apps/kwrite/kwrite-18.04.3.ebuild
new file mode 100644
index 000000000000..c9b017598b83
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-18.04.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kate"
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="KDE simple text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	# delete colliding kate translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kate* || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index bf6f66ca34ae..60faefc65a46 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,2 +1,2 @@
 DIST libgravatar-17.12.3.tar.xz 30064 BLAKE2B 0bababb8f69e9d18b336e59e15718f0d59a333c3a77801e2a5a1f39d39cdce498b0ca6a76277131194e1292b2649dbd31dfd5ec035cfa4338a2dc62867629344 SHA512 66491e357c8c1c89261abe1aec07fd3e56c45368404c5e06857c9c8bdc95001176eede18446317971e42731d604467ea0b5c829f7e1fb435bd7ed11b8a15f512
-DIST libgravatar-18.04.2.tar.xz 30480 BLAKE2B 8bce3dd136911d641263221d7086abc4c96eb58d7f527f6f6c16e28902d67960229375a2aee0d83fb0dbb11bd68f1b5cff25f9a5540be9d397acccbb45896f6a SHA512 0c211b0dd9fc90b11dd0b27a08ff7452b06467fe0f07fc3b5658c64fcb53eb3467e732c5fe3e145ef863280c96b80f524e06c7feb022d5549ac1e3591e7517d0
+DIST libgravatar-18.04.3.tar.xz 30448 BLAKE2B 1d13632884be127886eef875b8672954d926239f796156a4ec8616a4ff887c3487572c1bd24176ea37ea05c66a00f5906985a31d0193f1bfed78ee78690592db SHA512 ffdf46a77b47287dd6cb761f2885aaa0e8e9426ab721d8e28bd6b4269b4834375643c909400deb19c7e7db2096bb185540a7bc18d06350459fcf2c6fa84db504
diff --git a/kde-apps/libgravatar/libgravatar-18.04.2.ebuild b/kde-apps/libgravatar/libgravatar-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libgravatar/libgravatar-18.04.2.ebuild
rename to kde-apps/libgravatar/libgravatar-18.04.3.ebuild
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 52c98de0683d..e6a3429d267e 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,2 +1,2 @@
 DIST libkcddb-17.12.3.tar.xz 423976 BLAKE2B a5d4723e01e53c9b168bab44b54e89d16fd5d6689da6bfb677e023ccc4478e30c1e26d682712b4313991820282628a879e4a016397ca5b84f4b53a2158870f5c SHA512 f2131996ed0727a591a3e8a265c9c65f1d1700377ccaf35e9008a2c7aee1222bb3d37d47de9f740011e9fc9c7c13936f5e473f2ccc6990e683ccce5bdd0e95f9
-DIST libkcddb-18.04.2.tar.xz 427096 BLAKE2B ddb251b5faf057578583eaa5702e38b3745586ac3f5205476a6fdb487004091d508675f3380c8b813de2815fcec162ebff5dc0ce7199aad44b6c12ef2eec7dfa SHA512 e1bd8a52ede59c21d051ae224225a224c4b8211deafa4ac0ce1402b651acf3eb9a7d719d3e2f9164eb4e732498c8c11315db3d01a7a32ca16f0682272889201d
+DIST libkcddb-18.04.3.tar.xz 426936 BLAKE2B 417919ebddc5e837920921b31c85034bfa89916526cb180fd2a30066ce0c845d9bfa31921bdbdeeb71a07274f65b5d01e6d56e44d204a9bca28a59d0ef7ba109 SHA512 b89db360c2e2abea9a347eb8b3a4dcf9f6d8a4ade689aec7bef7ce674706cb28e078ce73440f320f855b1db80c927c3bd6da71554393a8948ecd5e99537ade8a
diff --git a/kde-apps/libkcddb/libkcddb-18.04.2.ebuild b/kde-apps/libkcddb/libkcddb-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkcddb/libkcddb-18.04.2.ebuild
rename to kde-apps/libkcddb/libkcddb-18.04.3.ebuild
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index d78dd8835077..25f0a1df1977 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,2 +1,2 @@
 DIST libkcompactdisc-17.12.3.tar.xz 88684 BLAKE2B 6fc33d00d71d03c6bdc8f35eabfcb21d69c14b81c65b88d1272da509a974958ea8c35df33b5c7834592098245dd46d3af132fc644c6203d9517657b871e54487 SHA512 260bac30666eae88575d5a584c89d78a3f39c9281260f07773cbed150eb7ef7f7b65bb41d904bf346faa311a118a6fea955a3cb127a27ee68c91b37b1d516cc2
-DIST libkcompactdisc-18.04.2.tar.xz 88516 BLAKE2B 768be553d2e5eb1a85db6fb30feba8856431e51ec5a54d0461fdadab06de391f58903b01f10871d52514282245ec452cb2dd3dd83a9687fc2331a7bdc4914a5e SHA512 4999cdc99150396591b9596fa1c256cec4bc7f3a4d3ae6cf1a297c0c679e457113739f29985e2a37dfed4c77a2649a243baab92b9312ca2f208bd63bb9ab2c46
+DIST libkcompactdisc-18.04.3.tar.xz 88456 BLAKE2B eab93aef5bf446f0c3dcda58ad06fbe6b3a3c969036f2c344635c3203e42aaf2e4b4a0657221f2a9ac838a5ebf20506329fa3e36c1b01d06e8478a48d4a9229c SHA512 b91212fffa3f977bcaf15476abec544dfeb1af82cd9315d338965e000713a8ef43a41e72f07b9d24932f9aeadc99f08737b300cdb9a5df7ddcb5b6087b9e5410
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.2.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkcompactdisc/libkcompactdisc-18.04.2.ebuild
rename to kde-apps/libkcompactdisc/libkcompactdisc-18.04.3.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index c30ecc128b32..78f001838397 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,2 +1,2 @@
 DIST libkdcraw-17.12.3.tar.xz 41840 BLAKE2B ce2fca321aae3fd5121e883299b2e10aaf79befbc4bbce0488f88200cf2816a9b83cd035e2af1c382751e8eca5d369ea88a63eaf71b1e7987eccb9e69f7198ce SHA512 f8248b22636b07083af84bcf66cddbca91cfe3d3966299f1d6c18681474d01fea395c4f855a628cfe5ec857efd4e4965cdc987463b8ff661f3425e81aa2f2eb9
-DIST libkdcraw-18.04.2.tar.xz 42112 BLAKE2B 8ff4b0b18ec645b1c4c0eac08cbaca00f762f135698cc52f265c687b67d79db57f718671fb0134ec6e8cf888f45c3c892b51cf3a77e19ff0fdd4dee60e062777 SHA512 4d4ba23e1db01b16ef721c3a35d09afc1735fe643d6b797b77910306915ad4c9458f8b5fb254769dd3fb37bf24eccd72e012a081bac1195270afa7114055ad11
+DIST libkdcraw-18.04.3.tar.xz 42080 BLAKE2B 70d8aed9021c193564152f10016acc327710b2a96abd8f9ceea8ead2e467f51659e68888b8942aa7f2bf7b756515ff4005f5966db0a52add5fb5ee9118b0ccdb SHA512 2544319d3b393e7fb2e21c357f0a602a1a3865f6111d18d301e1eeee5a38b14377e6e3c347eed4af88fdc652122611bacf2c2a32f4debacf7cbef12f270b86d7
diff --git a/kde-apps/libkdcraw/libkdcraw-18.04.2-r1.ebuild b/kde-apps/libkdcraw/libkdcraw-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkdcraw/libkdcraw-18.04.2-r1.ebuild
rename to kde-apps/libkdcraw/libkdcraw-18.04.3.ebuild
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 9d78c437418d..a1f612f5e039 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,2 +1,2 @@
 DIST libkdegames-17.12.3.tar.xz 5941232 BLAKE2B 6cb6f92c374f09c4c8f51bc34a163584ba48f44e9efc0408fed539cb9567d98f5c10ed1208a38c3117e64993826e006739a252623237028a9f2e1943d837f5c6 SHA512 159a2d6e84600e3dd92455c143ee0f8084db35e5f13a1d05013e8afbacf2d56cc9f67f1215be38ec420cdf66cb026d9e51b0f0d0daad76e3370374cd4317cd8b
-DIST libkdegames-18.04.2.tar.xz 5956504 BLAKE2B f95db68110f843d6395c267846b849ca0abe3ed54280aee24c1c2e6010e61c97fdada5a841588ecf6dd4b86ecec4d480192e3cbbc308cc3d2fc29e66a1a8166a SHA512 0dfaf23460c1510bd3d8fac6abab7cc542a29ee3e2ebdd6cf3276c6ea639ae5e99f4c05132fbe27eb903040a382f72de24eb333f579284c6d3bfa804d4507d99
+DIST libkdegames-18.04.3.tar.xz 5950408 BLAKE2B e0f02dff36e4d906c48da59a5b43271bea58aa2606980a31aa1b0f2c11741eae125c3e82a4a75eb391162a8b54248cc7ed687c17ced2a15a2e3f30e3040cb36d SHA512 ac31eb0c7308bfbf9d55f2cbfaea6a50d3f6b1c70420c17e2dcb9269b67831738bb1ddbb254f30bf4c6e34b90272b6c254d2bb5387452d0e6615a87a7be40c46
diff --git a/kde-apps/libkdegames/libkdegames-18.04.2.ebuild b/kde-apps/libkdegames/libkdegames-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkdegames/libkdegames-18.04.2.ebuild
rename to kde-apps/libkdegames/libkdegames-18.04.3.ebuild
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 2a29fb2e47d5..55f532f26c61 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,2 +1,2 @@
 DIST libkdepim-17.12.3.tar.xz 339628 BLAKE2B 318002f913bc16750f89c516a1f85e400caa7e11cd0e166fe5ba476927c49476700bc486ee3e20d38fe910ee109c95eb4cc0e54cbdef4bd80ccb0d3965177dab SHA512 e5e2afa569513d937c4f5f88909f158e7fbb067eed1a5a6ea7d6e91a784f75547e6f63e20a1d0bc9022229a695a010af43da6d7aa34b9f86cac57503aff436c0
-DIST libkdepim-18.04.2.tar.xz 341376 BLAKE2B ddf21a7105ebc793d4a17677bbf7cccafbb850d98d3a829a7a74fea422f5020dede43e17c3346c39898c403fd181656e6e0de741df42e965e916e9d2051599b3 SHA512 3e802528a514d83745223a54f9ae506cc159962a1997283cf9b8ddf1b3b7f39dc8f0d6737517051599417f6b9564b7c497c0745f9e220d526072e16fe31374d8
+DIST libkdepim-18.04.3.tar.xz 341360 BLAKE2B ccb6ee69a1110717be95bd305178f5e4ec017172dff4066779094f3def40d08551f855dad12c794d0c61c6076c1de4a0e1856b579eb687e2688f42779cee9d1d SHA512 0f2cbb71c54ed8477159a2d628222b36e791b9e626c736dcc5318ca9ae2c77a1958efbd3f535ff772fba9606734fe1017c2cfcfb18786694946fa7be40755ed0
diff --git a/kde-apps/libkdepim/libkdepim-18.04.2.ebuild b/kde-apps/libkdepim/libkdepim-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkdepim/libkdepim-18.04.2.ebuild
rename to kde-apps/libkdepim/libkdepim-18.04.3.ebuild
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index c9d554f6e1c1..a1a7e697c109 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,2 +1,2 @@
 DIST libkeduvocdocument-17.12.3.tar.xz 205608 BLAKE2B 5f25f6b96ca0c892fd746ecb3acc1c0799f7fbbef0e33611d28c30a56129ef0f0ae0e94db9abde02152f8394779902951be0c008e41b4938bf84f6a45cfa2799 SHA512 658b3a37483405f70e619054f4e99ddf23e590d4ca02f081f7ba217c6366f1db69c4de3041264fd7aa2610c20f927f810c5904a4b70dc7740609e2bb71349c4a
-DIST libkeduvocdocument-18.04.2.tar.xz 210508 BLAKE2B 26b30da44ba1ecd7c8d5e5b90f739b568c16cf86033da827132bd4a7c05e0d81dcf36ba54c783c3b917ebe1ff8fc31a3fabdd0ced3df6a10d071f39a35ed30ae SHA512 9035d7d867b18aa39148c416933399b47e086025e04e4de268ce92343006b1c19fddcb690dfc210936e969bd63b67a0dd683e9c5cfcdbd78be614e7f1a7eb8bc
+DIST libkeduvocdocument-18.04.3.tar.xz 210388 BLAKE2B 5026f210d3fabccb2b980596cbc98e48ddb2a0f26636e35075f414fce131a12c052008603e8683b13ef4ada53b9763744f2f2a08bb51c71425cf4c5bed65fcc4 SHA512 a703357c2444ee20ad38620575e07d6dcd8f49c45bc2e5b5fe464738d829df4d3847fc1f79698d309d88d6a652fe38ebf9776ce4d39dd11ddf774e77ef1dcfdb
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.2.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.2.ebuild
rename to kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.3.ebuild
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index c8ffa05098ad..2273babc617a 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,2 +1,2 @@
 DIST libkexiv2-17.12.3.tar.xz 64296 BLAKE2B 048fc2190770694fe76d1f0add3586fe3a8db0bddfb86714d1955753c9243863350912dbab670433f32f46051154b5fa9c0090794e3c46b70128cc42b73b8f9c SHA512 a442ab46a7dbcc7fe39e4907851d272dc8645a2e18c7a04de9723f6456aa04131f90def553ad922f51773574be753f13a0107cc85f39d1b136d1c422d1791fe7
-DIST libkexiv2-18.04.2.tar.xz 64532 BLAKE2B 1849a8e529a72536d9336baea6ef3f2629cdbf3663d480c81ec28cce7a2206a524c06e3a56b7392110e24d66bde40d65b89e6dcab2483ae7dce84c44358e8d86 SHA512 4fb6172c30a9bae0c2b5ea63f37139d76d7d689338f8bc653d2b9314c3f26fbabb1130ce9f6715a7da49b1980c65c19dadca8969d365d7f6dc6b2e526dde76e9
+DIST libkexiv2-18.04.3.tar.xz 64512 BLAKE2B fbd31c115e7292be62aa656c3b8c3b37a34b1740b1658b8d58f5a725d890abd55e2fca7cc646ea74af2adc30279b077ccca6e55c09ee0cc0a3207c5af6203ce0 SHA512 29c8295510d9b07204ab870ce86f5c9aede03459a906e356e8a1b63a89b24ff4d5f93ef13ea6080e1fb88e91e4694885892d88b3e822cade7cf09435f49d115a
diff --git a/kde-apps/libkexiv2/libkexiv2-18.04.2.ebuild b/kde-apps/libkexiv2/libkexiv2-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkexiv2/libkexiv2-18.04.2.ebuild
rename to kde-apps/libkexiv2/libkexiv2-18.04.3.ebuild
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 230375df7202..05930c26658a 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,2 +1,2 @@
 DIST libkgapi-17.12.3.tar.xz 175460 BLAKE2B debb06dd1619024ac29c9529b638f27896494049fe682b3740355a0e375bd0acf27d6e7e431b6fd241fa9285a6a1b1e076b51323aeef7d592e49c624a7e1fa7f SHA512 953ba55c5e645b38bde930a79daaf6129f7271fd2add45609975e51bfcaf516f87ea6f0e3b6811eb655aa0ae0a40d6408a29ed966acf22ee946f7a2b432079ef
-DIST libkgapi-18.04.2.tar.xz 176204 BLAKE2B 5db49cddde83ea618f90017980f084cbdd94659da117fa0e2bc195a40f8286f9d2e566d97ca4f777e3773274834c8caf09f64180e5cf764bc9d9e2be78037685 SHA512 47c161d6d8ba7bab7ae3571143ff27d797f53e6c6fd972a642397c8ef94d33e2e8834ca95d163656e06de150517ec62f04cbd436d9f2217fdac4886ac47264b3
+DIST libkgapi-18.04.3.tar.xz 176268 BLAKE2B 2f276af969d20bd22a4e19203499c427cf4d7bdfcaa95165b11449e96f733231dc0d208dcddcf310ca77a8ff380e11dc46d9f0068042d13da44d1e58dce59eaf SHA512 ad60348967b04b050b7809000633585a0a45fc7a8bd6627e5aaa7c62da5b158a6f7c6b46e5144358e7e6e7d427b65b4e6c6e9edf8625fe76f57cee7ed2799817
diff --git a/kde-apps/libkgapi/libkgapi-18.04.2.ebuild b/kde-apps/libkgapi/libkgapi-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkgapi/libkgapi-18.04.2.ebuild
rename to kde-apps/libkgapi/libkgapi-18.04.3.ebuild
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index cf6b77428164..40fd5359bf06 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,2 +1,2 @@
 DIST libkgeomap-17.12.3.tar.xz 149616 BLAKE2B 105229bedee238e85d31e382fde4d3b86e44120f6caa4ed346ba2832f01a71cb9c072a7330679934399a492d4978a72e2cc027810d5f897e4f940d50c19581bd SHA512 8d2a504cd7abf4a70b3ef3d956504279b5e4e8c045771faaced9dec140252a37ccd6ec098e93572530196adb8503de597ba45b340f5a9e787706680e734bbe76
-DIST libkgeomap-18.04.2.tar.xz 150316 BLAKE2B 86b3637916030730c958d5eb80249721ebbdefd4974d1b0e6a6ed15b29b33c04b26e6f99bbbabb6f20fc8fa133843bd5221ec2d0e699acb48b6e50ec18416fdd SHA512 781463834221b1340e0e7093cbe67145f89314705448a0cc972b1f4dffe6ae149a5c599c6079ef9672c295add5f002fee2488a18239d2cc60a89f5a8dfa7b68e
+DIST libkgeomap-18.04.3.tar.xz 150240 BLAKE2B 08d712df6c6d49eb82b21ef4fdff3b6c601f8b289167029c5c673e379e17fb904aceeb36062d437c1e4c5285e8b73a0df8d5485465e228fd4454847df818c3d9 SHA512 37ef1e70742c11e074cea9dab9d96e398637819ad87f6c422c62fab963bfb128c6fab49422135790fb09d2c2db6e920a9e1fccd5c901b460fb4afb567c65e0c6
diff --git a/kde-apps/libkgeomap/libkgeomap-18.04.2.ebuild b/kde-apps/libkgeomap/libkgeomap-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkgeomap/libkgeomap-18.04.2.ebuild
rename to kde-apps/libkgeomap/libkgeomap-18.04.3.ebuild
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index e25098e049e5..1f12972fe739 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,2 +1,2 @@
 DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98df111ddf1742180250248d86413769561f33cb5e32dbf228adc6990684b7376155b502b679a174990c820ae5b9b5 SHA512 de41304046874c95555d25828e4cc89be6391adcad657aa912d0eae62bed1fd52930e420aa24d53ab1fbe47677408416ccd86f3de027839a8cb44cd67a0352a7
-DIST libkipi-18.04.2.tar.xz 103632 BLAKE2B 4decbe39d715fdf9f77a70f44a71d3d6b9b5fc1e11f4e7bbfaf9a6d3bdec1cb07b99d291c05f4d8c9dcc45bebfd992692240d17e2bec19bbfd42b46385cfce64 SHA512 10707833c9e6d7b9212a3c75b90b89bfbcc18c58470b1fc236cd168cb2738954d71abcec534482728e53676f30322a99d87deb89e4a375521bbd41243fb3a229
+DIST libkipi-18.04.3.tar.xz 103600 BLAKE2B a8bcea9d85ee198eff9530d3cca2b5517db6c33d9746a3cea5e21fb651de5b13260e6ae0036f1840633b434c865d28c85cb846dda21e60a777ac3d7262811dd4 SHA512 3fa2fe8bbc5158bb1b06812ba708ce11feacacee9c9e39030bf4ef570177a8ff13962c02fddf33a6253f8db5d60805c2e1a65fc6264c7ca5d62e81abe3b44523
diff --git a/kde-apps/libkipi/libkipi-18.04.2.ebuild b/kde-apps/libkipi/libkipi-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkipi/libkipi-18.04.2.ebuild
rename to kde-apps/libkipi/libkipi-18.04.3.ebuild
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index a455c695a1b4..eefd46062b3f 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,2 +1,2 @@
 DIST libkleo-17.12.3.tar.xz 314656 BLAKE2B 18556390e7dd405f274709df054881ea565973b1fa1b743312506716d9e88dad1680722df35bd0e5d4431394249d5b30caff27456eaa028c61160133374226a6 SHA512 0ed3fd2416b3838a295e877b7f4134f4e5e8abf67229b40a70fb1d2310115e1eb51ee990a3f8f80045169ceddbb5bc4df85b9b9109c3e2fcc9a3f8aaa93cbdb1
-DIST libkleo-18.04.2.tar.xz 318620 BLAKE2B 24c4588a9a5fcbd45fb979f230edeb5fcfb19c0ec5ffb7b454bb16b5395c249cfc24afdc4d64beb25b4f3e1f759044011bb371e5f87b3b172f67fa02abe815ff SHA512 e0fe8b4727e4ed2342f047c0797b6bd14feb2b77f1202bd6cdc2275dbd471d2e7be3675a06f4db8c75c469c8b47cd3e4087dd617d7acdf3df17d948db5e69ef4
+DIST libkleo-18.04.3.tar.xz 318624 BLAKE2B d6a218e686994a163a3217c5a2d3beb8d471e484eb5ff917cad3d0f0a8d7ff336090a6a26beb1117dd09f7283e368d1bd91395d0a562eccbf128bb96a53ef702 SHA512 678c68fdc249dfea337f6f262da1d4e3b20482ab5c4db859a5fef04b8d544c0709e9dcb59fa33bab89a6de550c81ba14883c3d31122849c83674b3dbca00b545
diff --git a/kde-apps/libkleo/libkleo-18.04.2.ebuild b/kde-apps/libkleo/libkleo-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkleo/libkleo-18.04.2.ebuild
rename to kde-apps/libkleo/libkleo-18.04.3.ebuild
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index ae7cdff0b81a..c66e8596f676 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,2 +1,2 @@
 DIST libkmahjongg-17.12.3.tar.xz 1684924 BLAKE2B e6be87c90fd56848d7328564478f39451e9f90819ebf5e3df1555e7da2bbfb4417d6c08586b3e91ee4d76d585bff468d1609c9de2a6b0fa1bfe4a9cb6b65bda1 SHA512 ce98494e7f6169176f1ba6bd612adbe69ff725d20881f9ddea358bf31a52a15913653dc774c00ae7f805d6d4e0c563d77ebbc724d57425583d49bb093c94c83f
-DIST libkmahjongg-18.04.2.tar.xz 1684528 BLAKE2B 76bdb3fa4ac6aa9a747e238b7c73cb94d521dc5058b6e10c4971ced86afc80d1a8c2c41d02c2c1d277b7317f129469e4e54eab93008872ac4793c77a63300914 SHA512 9d0fdede5330aab8a0b8d0d9fcea63623a17e68effab45ea279b75de3bb8a10b00f35157e523680777495d243101a846a6b7a569ffb39bf3bb2ccfafbe6f8e88
+DIST libkmahjongg-18.04.3.tar.xz 1683728 BLAKE2B e821c23da691408b9f6c5fc8ad222317c497a27f221030e830201bfb180ac547269b9a2a4b095b7fe5535aff2ff9fba4c143eb4fd5ddd1ea349870f708b0ffef SHA512 f8ef97f0bf5fbd8c1dd923b26c42138f317a8b87df50261318ee438f29d53a99aceaaf077e24b36ab46e9f564761dcf389160cc657c6bec5ddf1c1ff3eddc87e
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.04.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkmahjongg/libkmahjongg-18.04.2.ebuild
rename to kde-apps/libkmahjongg/libkmahjongg-18.04.3.ebuild
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 045c1d0d4aea..102ca663153c 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,2 +1,2 @@
 DIST libkomparediff2-17.12.3.tar.xz 173804 BLAKE2B 51c3b5020ad614e947c69e6134954bfcb31a989970e8a5bb38781ba15c6c25b9c2eb05cb5026b7e22bb8481bf1a7a4c95498331aa4626ee6a86f154b13fb225e SHA512 d0a36eebf6bd64f69a49ff2908cb37672bd1ca8778e515e6638d199a626175026cbbca4ebbc7bd8739c683195e203162139833c24b1be4adcb019730d4ddc1ae
-DIST libkomparediff2-18.04.2.tar.xz 176844 BLAKE2B 4255340f17e30877b87e9bab4808b660a153aa3f33caf56015c0ea25cc7c1e5acb4d49eed0aad82c015bcdd22651ecbefe7715df8d3f6f2b2ca39d0c12fadb7a SHA512 30003c3598b9a6f6d2416a6df45145a91c75c32dfc6deaff4f0e4d5c4db4e4196cfde1076d24f89c0201e7d88028e4cf1b782db17c1f86efb96190ed4b5f3cc3
+DIST libkomparediff2-18.04.3.tar.xz 176752 BLAKE2B 7747d0332220f7459b735b2d1def2ca6bbdf80923530164d447795e8a3a1e01673661e1918dcfc11a8b8081ec8157990bdc53758455332c9ad92e6b1cf7cca24 SHA512 ad8772a7f1aa85b3c0d5e6fa7720df1399f7dbcc84a5be23da1a65106e139dcd8006f7c99975e07f8b8b1c8d706a89ac4718f10569f419c15e54835dd8e41931
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.04.2.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libkomparediff2/libkomparediff2-18.04.2.ebuild
rename to kde-apps/libkomparediff2/libkomparediff2-18.04.3.ebuild
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index fa4bc85e43f4..f39ac6aae594 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,2 +1,2 @@
 DIST libksane-17.12.3.tar.xz 136860 BLAKE2B 35b0a42949e007bdff85f9d6a68bbb52679e7d0307565f526354c21c0e027973ad5953aecb0dad31efc46927eef7b76dfb330083a9a3899a443d19c45868b1c0 SHA512 37c2e0dffb5cfa46254097668988da5691117b5fb4e93154e585025b031374577843d0c34d88515fc6068f80dd54b3865fb8e202b0b2e7c7a16729737dd79dd6
-DIST libksane-18.04.2.tar.xz 137488 BLAKE2B 13c468680a7e6b5b73bb4f0f7c9d028fe5448608528d3a6f40cff2124aa5783d1a4cb1bc9470cff35cd2d2c11c32748885b2329745a816df417c985249940af9 SHA512 7c4fd37ab689d4fc03e8969689ba149399ed23d61bede19f8ad59971fdfa96f389727c7943f3fd24ccd8771f563768f0954e81f35da7fbf73a42e5e252e5786f
+DIST libksane-18.04.3.tar.xz 137444 BLAKE2B c7f08d7de29e4a5672de8fe588e768ac7088b204782528777835adcd5b021cb261bc421a271bcb6a2e2a18918b4c04dd396a395123a6ebd5fc3878849f8d38bb SHA512 1e9dcc5ab7ac5a8df0bd20db589da05f067e6611d19b796208fe8d08e92568661707a7e36a84e9bd361a57231652baba5ce23211aff41a7db69ff0aa3abe200c
diff --git a/kde-apps/libksane/libksane-18.04.2.ebuild b/kde-apps/libksane/libksane-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libksane/libksane-18.04.2.ebuild
rename to kde-apps/libksane/libksane-18.04.3.ebuild
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index cb104727ea89..da32aaebb23c 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,2 +1,2 @@
 DIST libksieve-17.12.3.tar.xz 547852 BLAKE2B 28951b1af9ffec39ae86f718dc4dc860337a57f87a92716dc4db7ea1baac08d972210e655cdee1122fab7c0c30aa3ead36e2b4b52a47fb5d8a5cd4ea9fb9785a SHA512 d22dcb9294ff460511f64385988795d9ef16c3fd1766c9fa4e8696c5cde6250c5b499e135e605d97438aec91cbf831a9bed006aa008599d6d0eb1a30bfa5973c
-DIST libksieve-18.04.2.tar.xz 550552 BLAKE2B 5ed96e4c2fd3f22519d49e6e857940fbfdd7fdabbcc85fe182b071a0ba938d6e38ab54da01311865197deba9511b4a6855ddab5f1121fc41ef38e2beed9a0afc SHA512 9433004829cc737bb07ae6a913c9023a667ff930a49a7bf55ed64f3559fbc648a7f3c96e257c98fd73e6968fc54c6026067f7fb413f47ecc5a825118589a6f52
+DIST libksieve-18.04.3.tar.xz 550564 BLAKE2B 0821a88abe282d7d1d5c250088305ae392f0eedc26d54dd727ca1e3fc42769d1e9d1fd6fbaa22f6ca01a5bc817a39fb9eba983de2463516123cc5d669fb8a4d5 SHA512 65bbf4b13d98f7e0f8f01d4f2a2f7631e8cb72c448f8c46d985d5aed7fcb33bf03dc9f5eb7b7fc57b7e6f092b2360a0ddc8a605b4a130d18a5f73aff3cca93bb
diff --git a/kde-apps/libksieve/libksieve-18.04.2.ebuild b/kde-apps/libksieve/libksieve-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libksieve/libksieve-18.04.2.ebuild
rename to kde-apps/libksieve/libksieve-18.04.3.ebuild
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 7692bd3ed037..8bb1c6859685 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,2 +1,2 @@
 DIST ktnef-17.12.3.tar.xz 299892 BLAKE2B 1dee6c9babf502d91540e7c0322dcd6c4d8ac6002887b677a8e2f549f9bc90a77c448f3f3cf2eca1beaaf38613f65dce70dd61765dbb2015569936957c30be06 SHA512 77e86827a0bfbe614cbe170b503c88b298f155a58ca381e914779a7ea2f82cc1fbd655735cc6586b07d8e0f73e3b38c7ff5b94cc4513fdb6de74a82940c468c4
-DIST ktnef-18.04.2.tar.xz 300424 BLAKE2B 58c16a6d33d616d734d8f7a3700ab27d0ef62030998a038eb8f81fd9375e19eb11a88583c707962c70f0b18cb8b425a9206b717489d542fac65652263a7e7c7e SHA512 8c573bc0b653989f71cab33d9d3ca62204407a6d1b4a759cf9c334be772e530727f8b113f7af9b12377f3616acbcae7c9f59feece8256df2e90855da76cec622
+DIST ktnef-18.04.3.tar.xz 300348 BLAKE2B f6b0498917e74b102e6996916609e80dc60f3515bb83fdc4ac8730356b47ebb1e97c5dad6b813f72177ccced00b6594c394b5650e0328aa11f0d2745079de1e4 SHA512 532bd7ea26676ca523fa1a0cef924badfef71e7ffe92eb95e8581de250b219a8efe97300dc9b80cb7a4cc777cb8c70f39f0ecb4af850db0f1214c23c87cf5c2b
diff --git a/kde-apps/libktnef/libktnef-18.04.2.ebuild b/kde-apps/libktnef/libktnef-18.04.3.ebuild
similarity index 100%
rename from kde-apps/libktnef/libktnef-18.04.2.ebuild
rename to kde-apps/libktnef/libktnef-18.04.3.ebuild
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index f52d699935d9..56fa92fca461 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,2 +1,2 @@
 DIST lokalize-17.12.3.tar.xz 2219220 BLAKE2B 1f3d0617e7a504f643a52cecf1edbd50c62d4fb789914308fef9579649f0c272710ea0ee3682bceb6280d264481c228a52809bfb2623e0957ec4b1fea8256352 SHA512 02249c1aa91309bd7269eac593282d4b52ded71c7fdf251f01d63a56d7d0201b0def95b701cb5ff149468fc22edbe4022d1633d09adbbfdc8a8038460f3eed71
-DIST lokalize-18.04.2.tar.xz 2863048 BLAKE2B 52f26ed536625afc7d585094475fd0a2496110a698a5b02fa0eceee8e9ca72c8a1e2ea232d63edcf4919733972ad5f76cddd1ad6ecf1e151677896f9f97dae7d SHA512 571e9124d326f3745786953e89ab97f0f31b0746ad9ba86800067211ff5d1908d62309a1115d4215ca66680629a2d298daab04611220fd4ae91540eb6846932e
+DIST lokalize-18.04.3.tar.xz 2862704 BLAKE2B d90e23be2796915baea2ee6b9e40c4bd1c737e80650b15e47d97e55fc70f4b7895478e5929223929e174249f1e2842ab98301223f6be91a4010b1ad591826a48 SHA512 888aad396535c6f81c1d2e0546eeb4033eddde985ad4e956ff95bfb4fa5e197ccaa0337f29e724175794357846efe6e2cdb7cd22ae0860469b01359ad506d757
diff --git a/kde-apps/lokalize/lokalize-18.04.2.ebuild b/kde-apps/lokalize/lokalize-18.04.2.ebuild
deleted file mode 100644
index 3bd5fd7b1459..000000000000
--- a/kde-apps/lokalize/lokalize-18.04.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://www.kde.org/applications/development/lokalize
-https://l10n.kde.org/tools"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-text/hunspell-1.2.8:=
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}usr/share/${PN}"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version dev-vcs/subversion ; then
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-	fi
-}
diff --git a/kde-apps/lokalize/lokalize-18.04.3.ebuild b/kde-apps/lokalize/lokalize-18.04.3.ebuild
new file mode 100644
index 000000000000..d6566edcfd0c
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-18.04.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://www.kde.org/applications/development/lokalize
+https://l10n.kde.org/tools"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-text/hunspell-1.2.8:=
+"
+RDEPEND="${DEPEND}
+	dev-python/translate-toolkit[${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_install() {
+	kde5_src_install
+	python_fix_shebang "${ED}usr/share/${PN}"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version dev-vcs/subversion ; then
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+	fi
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 2b6720e8abbe..f4bde356f675 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,2 +1,2 @@
 DIST lskat-17.12.3.tar.xz 1216536 BLAKE2B 74fa8783569827a65a4554cb77a14fd61fb966c766b170f441d3c6655036ba0c582ecdbb06bd23a889ea759ccc34cdd80d6050fa8874d0e4cd8d22342c7f113d SHA512 519f68ab80771cd0704eb7c0afb3ef0c8b0f8e11d7cefed7e30a966dd0445adce9f6fe3a539be126640f70fd827f3f59a876d780a887e1086132ef6fdb8948b8
-DIST lskat-18.04.2.tar.xz 1217768 BLAKE2B 752c52b702025840f32d3c95017c67dc7a161b391fcd879718b3ac77f1680acdb3f6654be8961cb123817bb809336c17c2cfef8df842446e6e61828d8a2cb00d SHA512 be3fca7c3420e20babdd4cc2d9ab52a3e40c18dcd2d0614cf689ca38f71f9cb7a0593bbd0a7a03e2c875062748e531eba0baf3aa12f09e780367fdf2e1a0a9ee
+DIST lskat-18.04.3.tar.xz 1217296 BLAKE2B 2a4da1c93a88a1eb9058c110ea33828e463c1f063396768b8f14302f0ab67bab090dafcc7d209c287522225513dc0abdb4660993e5b05b6d8dc2f181fc75b3df SHA512 8951df28673e51f48ef2002049e34315b8102db2099cfde1d3c671fb2a332f4c44691a771ce9dcb23b46942304bb60a6e80371011fb7340e6038d887357048c9
diff --git a/kde-apps/lskat/lskat-18.04.2.ebuild b/kde-apps/lskat/lskat-18.04.3.ebuild
similarity index 100%
rename from kde-apps/lskat/lskat-18.04.2.ebuild
rename to kde-apps/lskat/lskat-18.04.3.ebuild
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 2f924c21e7c8..f15cb8f52db7 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,2 +1,2 @@
 DIST mailcommon-17.12.3.tar.xz 683392 BLAKE2B bb4796e8ce8fee59e3b4849c2c7c386ada08f77e2c2c15b9425f29c32efc3c65bc4bf9f667fd4e465e7c5f218ea5830ac8a0416a956606c5c12f6918ee8e3b8e SHA512 49c6ad5844cf5f4f884b7cdbbb855973bf8d0e5b9630700e926b75024b6aab98f5f7e05dec6dace3648181f2c57e07344245b2d49c3f293e378310f4b647450b
-DIST mailcommon-18.04.2.tar.xz 691940 BLAKE2B 99350176c7c1474b3727dabdb4a2f1b3843739655da50224264ed01d26a73aa0124d9f891d8b55d380ff4ab6893d659e571b4e3f0ad77c98796dbc5fdc8092c3 SHA512 87a2c678acfe5a16206f8e841b66d5fa467fa760865c669aefb0f580e4324ac5ef80bb75808d88557162c13e62a43ca45063fa1d40b2dbeb4087cbe2b6be692b
+DIST mailcommon-18.04.3.tar.xz 692256 BLAKE2B f216b27717513fd034ebc22c392520d24379d317a383a1ede3a7b7be19b163bd104b45daadf75a2986d049d6db3695243c5ff9a5169fe5b75eb525ec20e2fae1 SHA512 0e9a815346ab4fed073b11cac2ee7d9e3612ae494e35937f6c0695e2572f7a07c17a0595274a4f806ee48f79192914506c6c6966811458cdf0b6d7420d8e0bed
diff --git a/kde-apps/mailcommon/mailcommon-18.04.2.ebuild b/kde-apps/mailcommon/mailcommon-18.04.3.ebuild
similarity index 100%
rename from kde-apps/mailcommon/mailcommon-18.04.2.ebuild
rename to kde-apps/mailcommon/mailcommon-18.04.3.ebuild
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index a1decc0fc202..0153cc2dfbf9 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,2 +1,2 @@
 DIST mailimporter-17.12.3.tar.xz 541040 BLAKE2B 42152e6205c7cd0320c6475f731af1cb1877ebbaf7b1b77fd3c84d2474ef7fd9b815e3640fbf962d283627b84cd5096a200e030ff8f22ad4052a8df27fe977ac SHA512 a3485867ef68499660c6b9b078a75892df0fb880a050699543fedfd32992deda641d1477c3f30036d59cdaf926a83ff868cec700a394e595216d0094870f8ded
-DIST mailimporter-18.04.2.tar.xz 541460 BLAKE2B 4c730195db067124253eb3bae5ebcdd6935ac4554f4d7892d1204622913332d65c8994b7f8c72d0feb9b3dea0c240d5a16e4cbde6ef5f8a59c792edf71dff617 SHA512 6ae47db19d2c3b9d5952609b7497d0adfd28a0462a3cf46cbd85201a3ff96c699d2e7d7d5908fb242bd5a11132bc3fc384611aeb8b5b6741381e174283b28c81
+DIST mailimporter-18.04.3.tar.xz 541376 BLAKE2B 7a2bd20c220a529642b73f807e11d703cabc9d8cede9d7234611a1e3b63a8aacbbd80e68bd643658db3df82388b474834ee1bf212fe31a908c0089d91b5a11ee SHA512 43428107fafd7c1888249fb77593d1d4476326c2aa31eff5ec5162d042379f2eb92905acbf829955142b3cf6eb191e0f72e5d34725d29c013488bdb334217fbd
diff --git a/kde-apps/mailimporter/mailimporter-18.04.2.ebuild b/kde-apps/mailimporter/mailimporter-18.04.3.ebuild
similarity index 100%
rename from kde-apps/mailimporter/mailimporter-18.04.2.ebuild
rename to kde-apps/mailimporter/mailimporter-18.04.3.ebuild
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index f1ce556a0b7f..76b432000c7b 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,2 +1,2 @@
 DIST marble-17.12.3.tar.xz 52353704 BLAKE2B 529d889631fc5c2409d72bc7b1626673957db3db1b8e40478668596a3993dea67fd9f6d341e62ad426d1cc8e4295726471247bb9c2dc7fdf9439c4304f6bcff8 SHA512 a370f6bbce35ad4d4eb5a6d372939691322c81b7108fe64468ac3a2d491d0eb71e6c3135106e33d59115008a527aba60d2bd3508df721b5728286f526f199064
-DIST marble-18.04.2.tar.xz 52434940 BLAKE2B dd2881da211d4111ecbc0950b9bc7220dc25da5f8a94c2bac42b92230498885526882df8dc2bc93cedab4420351ca2a73f295a142ec7d02db68d1ef28235b2fb SHA512 617941338c25b73e33fd9fdb943078544851d0e214c5cb4da6d32ba34630c0eb96165e37f3b14fe163be31720572411feba6bf6a6f24b15b469707e361b5d435
+DIST marble-18.04.3.tar.xz 52432816 BLAKE2B 103aadfd9e9e940b6c090f124f29464925c2e5f6adefbeac476ea5f8fc5c5eacf9af4171959f6a17d6d7fd5d287b2db8b246a08d0af045c5529f8eb92b566744 SHA512 26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704
diff --git a/kde-apps/marble/marble-18.04.2.ebuild b/kde-apps/marble/marble-18.04.3.ebuild
similarity index 100%
rename from kde-apps/marble/marble-18.04.2.ebuild
rename to kde-apps/marble/marble-18.04.3.ebuild
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 375f8dad80b1..95ca288cd932 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,2 +1,2 @@
 DIST mbox-importer-17.12.3.tar.xz 32868 BLAKE2B 12d8d215e019a65e4f81239cda524cde0ea16dea78ccdde7fc5c7cef12234b2771ad140e29ba9d96b277188dc43f2faebb98f7ebffe9aa12b92ef5d69f777d0a SHA512 018aaa5f533dd70c1e11b164e9ea948dd04b31d6747cd879ee082fe0544b32a5d5223e9708d489c96b1b95f662d549a207c336555a6e16c28cd57345d8d50bcb
-DIST mbox-importer-18.04.2.tar.xz 33700 BLAKE2B 6172a52b9c7febb3b5a4c171b5b92dc3f9156b22c58fceeaf879d559c3b82f3bb1e37dfcb2ea3800156b045985f24c17318f63fcf208de04f4a9c8f01bc0d273 SHA512 dc96c38997d071f33d8cbdf624f010dffd03a56533744f31c130b216b83c1bb69f9adb68abc2925fad89cee02fdd04429868a2b064e7e2c65ae2c40c0c1f59c9
+DIST mbox-importer-18.04.3.tar.xz 33656 BLAKE2B 94febc2a7a72db0a5fb9956247e3debf312b0787765f0712c2ac5f364b85cbce05c970343b5fad2b3fff96b69c2e5ef98068a4565f39a065f482e2a91a371988 SHA512 afe51f226326a9b94e81dd65d6cd0fd9ac6e5dd2a50cc6a8ae2b856bec371c8739b375ebf150fb778a76f1d62f175dc80fa9260655d0a9d964fbbf874d9da241
diff --git a/kde-apps/mbox-importer/mbox-importer-18.04.2.ebuild b/kde-apps/mbox-importer/mbox-importer-18.04.3.ebuild
similarity index 100%
rename from kde-apps/mbox-importer/mbox-importer-18.04.2.ebuild
rename to kde-apps/mbox-importer/mbox-importer-18.04.3.ebuild
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 7a7644b3ed22..a2e29d3ec750 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,2 +1,2 @@
 DIST messagelib-17.12.3.tar.xz 10462804 BLAKE2B 4fb020e5f351a14fa73cd8a648440bb2da8b9658fafd36fa58b7499726bce480e5d452c64a3ca5cc2e8b99596088b858601dc97311bd3ab6b8fceaf0ac2738f3 SHA512 db83fe6de67a4fb2a805d8aaec8de6455509868e1bf664bcd5a3f6d25ec100dce71ca517d4de11c9bacaf194c2dcab78b83c15ef0d0eb82a789ad1af5a352412
-DIST messagelib-18.04.2.tar.xz 10470968 BLAKE2B 70f108b8578f77a146d02990ab4162c0b469e0b61f5206d93708cc1fbc97ccde796bd007015dc59a018728185512475e0bcc93fd85e60e07d2faf765ed35be30 SHA512 72bf59c87b463663df69a0b42ad35f6153f304e09d034a7f2eac9df31200a0700576cb2c58df239a12967861694938e66e6c9a9f08fa8d2ff9bc3021dfe23a63
+DIST messagelib-18.04.3.tar.xz 10461448 BLAKE2B 812f5679a6bbca72da39c980ce10581b96cc844a7c38b87a9d5ea5eb6b6ec58b26b561fd4abdd782d39012d314aa0a5134683454a604ba28a1cdd301ea53f25a SHA512 4aed5990ccb9f5f1fbe5b6d71a63a2ec2f342a7eee81953417f3ab9537200fe66f95d742ffd6ba4f2a9f794b0b119db2e3f3d0766344c8459e1b23b043f11fce
diff --git a/kde-apps/messagelib/messagelib-18.04.2.ebuild b/kde-apps/messagelib/messagelib-18.04.3.ebuild
similarity index 100%
rename from kde-apps/messagelib/messagelib-18.04.2.ebuild
rename to kde-apps/messagelib/messagelib-18.04.3.ebuild
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index d55d13012ac9..21ac142c8c8b 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,2 +1,2 @@
 DIST minuet-17.12.3.tar.xz 27860148 BLAKE2B 20d897fbebe844fd77da3c1cffd94c021999263b434507a2bc73ce5c2a7e3d0823c2f724a6d51450fbfbc450a72a66cc4823d6c350090372280b51bc5f3458c9 SHA512 ddba91a1d8165412099bd60cc06e57db70b3aa6997bb93c9e3c46ea933df728836cd59f24a2b7ff1e1adc71e802a0c237ea90a72012bbee79c6601f73e650dbd
-DIST minuet-18.04.2.tar.xz 27843668 BLAKE2B 77a62fea779228df9bc0c7bb712b10dae8756971d6526891931311ad704efb8ad9dcf0e25ba19ce24e542ca3bf6878922cff6409b435e3485f8804446df8ec22 SHA512 44fe5c9f23114cd0295602dface7fd45e3920c7ad66a96594bf25d39825e4de3ab395f67479f55ae7c793e33ab5d5f100457d5ca9451da37a0dcfd226fffe27f
+DIST minuet-18.04.3.tar.xz 27786944 BLAKE2B 7386bd7a14dcb96225eb7fe070cd914f8a37e0fae5d0f01559cd468bc3d8ff1f26da4ed5b8176e1107b646bb453e5e9a68d4336fe106de46491db4fe880224a7 SHA512 c602b377323b1bc3c115a9297ef042738f25274e5b028756aa307e9b0951dc853771b9e4031d6ee39c868f2db2459ae316f0691a8f5efd291e89bf9c88c5ee19
diff --git a/kde-apps/minuet/minuet-18.04.2.ebuild b/kde-apps/minuet/minuet-18.04.3.ebuild
similarity index 100%
rename from kde-apps/minuet/minuet-18.04.2.ebuild
rename to kde-apps/minuet/minuet-18.04.3.ebuild
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 09c928371d7c..034afbb7875c 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,2 +1,2 @@
 DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361
-DIST okular-18.04.2.tar.xz 5786132 BLAKE2B 18132088abc4bdabdb66dacdf9fef6b3870ebfee54b95ee4b3e7da29d54cf2e86af705c56ea3ffc9609601ae4b1f81bdcdb095cfac7e60e3f5af66af73a372d6 SHA512 486df74c7791a87a9e38601f4d7039e59cafef3a474d67d58592da81a1a61b116063b0868f4aa75a15eefa79568ae5f609ce0e65f4e14edd012d9e2622ef1935
+DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b
diff --git a/kde-apps/okular/okular-18.04.2.ebuild b/kde-apps/okular/okular-18.04.3.ebuild
similarity index 100%
rename from kde-apps/okular/okular-18.04.2.ebuild
rename to kde-apps/okular/okular-18.04.3.ebuild
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 04df6e2a2249..833f92afbf33 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,2 +1,2 @@
 DIST palapeli-17.12.3.tar.xz 2061492 BLAKE2B 677f29453a22a4f48b842f4c8d368251344cf9cd2cfcfee0b3e2fd6aed315a2879e6a6c86003debf2ffbcf083a9b1164171fafc14691df953f909185c74a8edd SHA512 7c43d9854fa8d27290b97d8fbb56594ca45593d80ac029652ed355c0bd59eac3c73d0b226a91801a7dd62c76c41a53783dbfbc62238dc26cd6bf3aad3aadec58
-DIST palapeli-18.04.2.tar.xz 2061884 BLAKE2B a4d345706f3f4db707638d1f7dfacad1efe156cf723fcb31d4196af0c472e8f14fbd977e71790417bff8257760b5a669f475a3d00a6c69bdaad0c7e431e4019c SHA512 5345cc2d31d093fd3341becab6e08a8d53b6f9e969eec89c52a7f2f5df1c9d39a30f81b22380504ef2b3a8070addb93febf12999a6cda214fc5ed7e19113423a
+DIST palapeli-18.04.3.tar.xz 2061768 BLAKE2B eb1b8e499be2af52c9111aefce2ae7d9850a6538bf7e4414eb9265916fe7b2ec3f9ed152c45189e8e7d01fb7cb40152605001bbf4d6bb13e2431de1c17a90b89 SHA512 3da548346452020f398229a1c0c7d82062742fb729ca52e6781d809c59d9e7051e3d697dd156e58a4a6c10af04e5beb81609a5c6d70d139cc90ff5dbf5652604
diff --git a/kde-apps/palapeli/palapeli-18.04.2.ebuild b/kde-apps/palapeli/palapeli-18.04.3.ebuild
similarity index 100%
rename from kde-apps/palapeli/palapeli-18.04.2.ebuild
rename to kde-apps/palapeli/palapeli-18.04.3.ebuild
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index a172ef3a5d04..e261f185a834 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,2 +1,2 @@
 DIST parley-17.12.3.tar.xz 8826604 BLAKE2B b24d1f7fde26b78c4d7abcdc18994a09adc58a29edd6123c8961d2dc148aa1adb82b0791e98dd4f4f588acf2400ce64b7a911334909b75deca07cfb0dde5dd84 SHA512 301e87605e754aaed520fa1bf96a7cf23b0c0a6523ae59817a6b14a8f69d3689a8646437e580a3257f42b197e6c7f899593cd242e9cd44ea1cd135327e83885f
-DIST parley-18.04.2.tar.xz 8829752 BLAKE2B 992abd4ba39b7dea1c725cae085875842781ee0d0087635dab7b4d51108373b7ff77ac3a5ff73664e44883181566a87659519979d305308458c4388e32de7325 SHA512 d213c3ceeb33a31a8848840c16207788009041eafdcd0fb40c362dc1365ae743f92536d5bf7508711f813c54e23cc0bca9b9e712861e6e8897e074017c539867
+DIST parley-18.04.3.tar.xz 8829720 BLAKE2B e49cb4d1474a8eb0785b5e868d4cd56cc0c2616e5c8c2f53ebac478e0e561fdae871106c499563c1c3a17f58bd8dfbcf979a4bd4991cfa4fc13934585367e51d SHA512 438648d1b15b170d33c67b5ac3101558da0c6b67b9c8096d5634fcdead737764579276dcfdca6e55d192366b1eaa5536c2f77ae76bc33e760150de401be18fb9
diff --git a/kde-apps/parley/parley-18.04.2.ebuild b/kde-apps/parley/parley-18.04.3.ebuild
similarity index 100%
rename from kde-apps/parley/parley-18.04.2.ebuild
rename to kde-apps/parley/parley-18.04.3.ebuild
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index dffb3ae70810..2f7147c2b2c7 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,2 +1,2 @@
 DIST picmi-17.12.3.tar.xz 1147600 BLAKE2B 9a09704d57b93e6e8ffbd5843570f9c6ab407c31a60313f9c4119aab97237b348b17ad1d8cc1437a664f05411816e91e8870694e8aeb09e9275e3327e0092f5d SHA512 06fff4d49e4e2bea3aab3c0ac9d06552acbe1b4e006ed79d5a1f10c31f4f7255bf132fe6149451536498959eb90fc7dad3c20396f783efe5c16fecb2b4828647
-DIST picmi-18.04.2.tar.xz 1146788 BLAKE2B ed4cdbd55e0d18d555a90f795be3a1f83f6f3c26d7c640ecf095148feb0e32060bbabeb2dbd9a60ae58ce5d1705bef57124c34a4f67efb716a46684aa6354204 SHA512 696f3a7feb304bd2d53c4fdf255c5488b1332c2cbd43123f50c900da1c056261de7b5b906828ea7b92030423db762bbfe921442f612d468c607431820d3f5b59
+DIST picmi-18.04.3.tar.xz 1146732 BLAKE2B a9f64f79c629c6bdf7bf5b38b5aaf2b3ec8b71bedf7c54cc5f9b9cce862401b6f09def37824c7196d9adf7799a8e1739749cbecb6ce09317c2676aeb938c89f6 SHA512 a9eecd7e746d2f64bb4587c88137208eda644a6c6f23f21e6405135397ed3f562d5ac2a4c33a88c99a7191a56a0568f489ca8cdb9ebc68e5ee7dc6552ab3a4c2
diff --git a/kde-apps/picmi/picmi-18.04.2.ebuild b/kde-apps/picmi/picmi-18.04.3.ebuild
similarity index 100%
rename from kde-apps/picmi/picmi-18.04.2.ebuild
rename to kde-apps/picmi/picmi-18.04.3.ebuild
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 2cc9937182dc..61ad336a71ec 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,2 +1,2 @@
 DIST pim-data-exporter-17.12.3.tar.xz 267124 BLAKE2B 6c515327b444c9a7ddecdaa4e13f8d2c7f674a6acd1b2d4a5e314f330bb9e505112bad52674639f4a1f2f1ed29f5c5903b5eeba62578b49354a7feea0005fc21 SHA512 e0dd0fd6356b668f662afedb64d3fb9ed68da9b869635b7773bcae23262245e4b3246e0eec9b4e5bd45c28c506a0e54cea5819556bc1681378417830de458a0f
-DIST pim-data-exporter-18.04.2.tar.xz 270236 BLAKE2B 91fd5b2496a869a0c42eed1de92f4c9e5fed5faecaf3e5a2e9691a0885c4fcdd93a4ccdbca920b55806599354a9b49070429444be53832cb8277ae29605af0d1 SHA512 22600cd10bc728fe61337d5c85d05fcaf7838ca63cb000e5ceea0d697d41b5fe2cd351ae5d97690876f6fc535a9756fa33b89119fab5addf243300c716b6ab6e
+DIST pim-data-exporter-18.04.3.tar.xz 270248 BLAKE2B 27d8545408ba37ff7790e84d02455785b77b0eb865e5b236fc15eacd81e3df99d37f2c84e40d6cbc5ac9296d0b95a290744e5dc9c2e5103ea9deaa987421cb35 SHA512 29550eca64b6026c900b30303fed29a06b31a7c773f7f387c899afbcd7b735a07efe95cf7366ccbb6ba6b4884d1c1491193ff2f817a032f27002bc8234b82301
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.3.ebuild
similarity index 100%
rename from kde-apps/pim-data-exporter/pim-data-exporter-18.04.2.ebuild
rename to kde-apps/pim-data-exporter/pim-data-exporter-18.04.3.ebuild
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 44839ad86d99..3bb082cc68d1 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,2 +1,2 @@
 DIST pim-sieve-editor-17.12.3.tar.xz 444364 BLAKE2B 621dff6212eb50b328ea5a559cff3322fb7a7e22d7ad33937c0a84e3bd4af5b519e1c1abb4a5586e84b042e4f0d4c39416aa0e8404ebc786f400747c85533e3b SHA512 812508b69ed0d4f0d2312cc74a3f800a06246e0984fcde386fdbb9e9a4ba949dfdb8c41a88f5a6d01d4f4c0c019a791a1c72edc50f446dcd9bd68a18c6623bd9
-DIST pim-sieve-editor-18.04.2.tar.xz 447292 BLAKE2B 3aebf7e12ceabcba10967976f345b89c877dbbed3cce93125ead7da2866d4643452b8bcbaad74d95ff9a1a47f2b022d50b88479ae43788e937814c2ced4f6406 SHA512 c90da8147d444529c0a33791846e671d4075ec24e0f84b3a2edc9091e27d2d8f45dc324cc3e4365dcaab47de33431d3e44d47eb003af6fe504e2d693b8b5694a
+DIST pim-sieve-editor-18.04.3.tar.xz 447160 BLAKE2B cc28510ee0278a691094c42df113f02299b74830c410f74467ee69b59d2b6a60e5b0861300967c1857c5afa57025d93c1909230c085e1f7caf2ad9b30cd79728 SHA512 344ba01e3f67c359e912e8bbb880aaf7ab1c8a77e793614a1ccc358551e3c163eddef7c48b178678f99d40dcac4a8f1b687084d21d37e39caf98fe75ebb88a93
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.3.ebuild
similarity index 100%
rename from kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.2.ebuild
rename to kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.3.ebuild
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index ddd4a7e7b53d..ef5ba747f22c 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,2 +1,2 @@
 DIST pimcommon-17.12.3.tar.xz 287564 BLAKE2B 862d6bea6398edffca88f78901f8c59ab8721b210cd9d4e7e73f16474c7c58357977981d65a808b2d02501927257e96990b79071056e86aad08d97d23491569d SHA512 79aa5f3b7d61de547a07ef659e1a7d0b2c456010cb7ad929218853d5f1057a97e5a0e2d1197cb50a1f5bb201b3702efa0e3e1c154d530c49ebe51578d2690df1
-DIST pimcommon-18.04.2.tar.xz 295500 BLAKE2B 82ed80b00e3f4c1a7ca342f961348127b60ec4f3b8562323652bd1091de8150ad4160523ffed091f5d9796c38ce8d2e64beb86fb2b619a19471ce1b588ce5943 SHA512 75db5a4792dc0043ab93080e7a8c5efb6069e1e5e65b96cf88bc319dcfe86996f7421547f9f81fb951b8e8707f8a736df5aaf7d3ce55b2f727a7548e3c4204d7
+DIST pimcommon-18.04.3.tar.xz 295512 BLAKE2B ce4697b0e850b7375741e5af2a0abca7b2cd8ded341338ef6f1b358df66d724d0c8f01c45b5d13eb042bcfc3f396545ce68798d37a3009c2d00b51be901e2957 SHA512 c933184da3ce1626a28bc20b851c583e0fc21485855414b0e9c161cbc7eadf7ffe1916dfbbaf9e74fb48eafe152436ac73a5082c2ccbab219aa45497c45f4e14
diff --git a/kde-apps/pimcommon/pimcommon-18.04.2.ebuild b/kde-apps/pimcommon/pimcommon-18.04.3.ebuild
similarity index 100%
rename from kde-apps/pimcommon/pimcommon-18.04.2.ebuild
rename to kde-apps/pimcommon/pimcommon-18.04.3.ebuild
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.2.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.3.ebuild
similarity index 100%
rename from kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.2.ebuild
rename to kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.3.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index ade18d93da35..caa1f6d9d993 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,2 +1,2 @@
 DIST poxml-17.12.3.tar.xz 43004 BLAKE2B d6a29c953c091cb7df6a181285ed1a9376db87be2617b00efe9de56ae6bc06d11522a0fac69a7a4d1e2b1a085227c0e17935bb1ff0abca6119bb115b72e2a952 SHA512 c9b45bf37c200b206ab4e114964d6dfce941f974f56d2703ce9ce5ea5314be0224cbf3fa1855d0e423b27b7ca1664a9a372f9322305c76b26bb340e9876a0e34
-DIST poxml-18.04.2.tar.xz 43268 BLAKE2B c22afdfe38764f4900da32cdda6e2e9972f5daf662f5e0bb4b8f984d9916d047edc8a62f301bc1e25f50861021ef045293471025dabd131c6cabb253ab7cc40e SHA512 9880af0e92f2bc6a5c1145305ca39d8eb8ede1b8edcb15fd2a0015fd7f6e8a4db82a2d3a80655b22e3fe70ce6a65ccb022ec26fd288cc3665716c4a82841e4ba
+DIST poxml-18.04.3.tar.xz 43160 BLAKE2B 7d54129aea950d4cfc238ec03b31aa5e7f7c016f871ca7bd675bda46baef19224de429ca1314a2cb029a00279dd8022c8975c754f85614189abc262636e4aa67 SHA512 176af4e57c90354c0809d99ac1d5260ccc44eaf73a670ccb7aa205f4e67966d36ed68f857a9ce62660186b738688d3bd53df1477cab9af623660062e42862b81
diff --git a/kde-apps/poxml/poxml-18.04.2.ebuild b/kde-apps/poxml/poxml-18.04.3.ebuild
similarity index 100%
rename from kde-apps/poxml/poxml-18.04.2.ebuild
rename to kde-apps/poxml/poxml-18.04.3.ebuild
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index c8c783a19fa0..b40e28f7bf5d 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,2 +1,2 @@
 DIST print-manager-17.12.3.tar.xz 237128 BLAKE2B cc1a85c6ed2f160329c5428de7c6de562de7f5c3876fdd504e619801e8ededd792c8b69c9193a787d1600948f7fae3a62a7290e1e50ea5bf39475d9db9c9c66c SHA512 80e40c913da002beb3e473e0e6fa6f02b0e3b699bdc49c390435d9139f46b1fb3ffef54c042b5dc2a1db3b83da2f4f53377710b31281b0154f9654f605b95830
-DIST print-manager-18.04.2.tar.xz 238860 BLAKE2B ebf93bbd7f824603df8819be16f829a5e8e40efc3a4eebe4aa3d6a32ba2c5d28afc128482445127d53231c50d149820ee2aed22d055df27a916e9f885ff729b5 SHA512 ab9db5fdb6e21c1774d1b7294a096febfc669a9151329d11133d36575565b8c0bce41b4e89e99c8ed0d2a39d4b71cfd94389c197b2515f507ecfd8582ed85fb7
+DIST print-manager-18.04.3.tar.xz 238724 BLAKE2B cd372ce2408287ba5c1eff2b614dcd5eac2d44f7a61aeae9c4376b47fbe7eae786fbd1349ba50a436916c36f8671652776464aff4738ab55c2e91b04052adcbc SHA512 0f3ea85c704a596a299e457b0c73afe844c1f2d14a76952e4abc1f3a90a10ff6e28b380a27f383939c0f9f2412c62c1016be2b63220eb664ef5da5ea627ce6e1
diff --git a/kde-apps/print-manager/print-manager-18.04.2.ebuild b/kde-apps/print-manager/print-manager-18.04.3.ebuild
similarity index 100%
rename from kde-apps/print-manager/print-manager-18.04.2.ebuild
rename to kde-apps/print-manager/print-manager-18.04.3.ebuild
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index f8d65e0962ad..5da3dcf97c8a 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,2 +1,2 @@
 DIST rocs-17.12.3.tar.xz 1529908 BLAKE2B 2913e6b609b349c6b4fe2e08c41ba63c90f0a144676ec9dd64203f01ca0240b934e0de48e2e068dfa2c860be5bfdf4fcf883b27b1c11b7dccc6d832dbff520ad SHA512 5b90ed37b62ba5752843d0d9be46e5139fc7017dc5f620ad5bd07de10a6cb6acf601609edf5856048914fa11866045b2e1fcd859881dc6e9bcaf5239ccb2a6e2
-DIST rocs-18.04.2.tar.xz 1536088 BLAKE2B 0c5e20357162bf52d5a05b2d43d553e5371b93f8a62fbfb2215cfaaf870f1481a716752a4301aa15d2be4bef78818c0100612030e923c754c17efa164b80f80c SHA512 e820eccf34da78fa5c165b98576e5e25625e49f21826cc63375f38b777c573750d5e65203635def4ff0dbdea2aaf72e30aaa3b45127a1e6c550b179adc7bcc24
+DIST rocs-18.04.3.tar.xz 1519052 BLAKE2B 14c2143ff855c2719b311c7824084e5c0597fad0969e7d5850429d48b51bc1629a27f13129afb4cc64e65d00be1a5464923102e4111819d071cc82648ccd669c SHA512 90d7af9934d2eb451882013676dee3d6b9aef421043dc39d17e3bfcc05d03b6c21d1f1836f247cada5e9b78d065d1544828bfc5288df8a1250388e48d26bede5
diff --git a/kde-apps/rocs/rocs-18.04.2.ebuild b/kde-apps/rocs/rocs-18.04.3.ebuild
similarity index 100%
rename from kde-apps/rocs/rocs-18.04.2.ebuild
rename to kde-apps/rocs/rocs-18.04.3.ebuild
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 4debfdc2b548..15ee021b3ad5 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,2 +1,2 @@
 DIST signon-kwallet-extension-17.12.3.tar.xz 10580 BLAKE2B f5b674d99146663411ece436715330a990d15d19befaeb481e97669a9fc84c6e726deabb247c084e9761c713d98ad250ea2fa3cfc4996ab640d1aca3e9e27ea8 SHA512 181f990db14bcb7c2247a85dae98026289bfacf3f6052047c7d8590c3e756f06f072569c295d687bd3fb81a45796e6e2436665dd1bf233c0ec6e84bcd03c7588
-DIST signon-kwallet-extension-18.04.2.tar.xz 10692 BLAKE2B ea3d36123ad1343e38af7909bdb838ef5b118d0a5e0badccbb67d1a299207d16599901760c3716db81b06a3ad0f46f088c972404264edd9ecac5e3a49538d6c6 SHA512 7680c38196d2782cadc922f53379ae3bd396d446ea8b2205facd1d22e24d1c9c783e33ec51012de76f9892cc06734b007770870b7e5b7ab0c965e63cf914294d
+DIST signon-kwallet-extension-18.04.3.tar.xz 10684 BLAKE2B 66907d002684bc81bb004f156c89e44b9846ee9c877e2d5faaab38a7f9bdcb48d245e9819652485ebd12c00c182c280936bc8a055ba687c567d24903e55df631 SHA512 30e770b5b8fcf58dbb856fb8e187ffeba50aafa6a8e38090c37842fb84dd9d6374dbd064919baf16584f7c3bd41f7224e8f0f4d8eb9e00954faa3265b21acf5b
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.2.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.3.ebuild
similarity index 100%
rename from kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.2.ebuild
rename to kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.3.ebuild
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 29a4d471f942..2356e2081636 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,2 +1,2 @@
 DIST spectacle-17.12.3.tar.xz 765132 BLAKE2B 824e2f260e6da5daf51463dd9f99d4a4dc405e9b3c9c1149cf8dc6dc4296ac7ae75d2dba7ca341c767b86ef0d6fac44a50cc644e9a8dcee469de7bd5f792e514 SHA512 286a4c4fb0a6d97eb31bed38865f2717b52c215074bee5dc4b5730ba607d6d25ce641d1b611e974178d33d6bff400e88cc0730c6249d21a4308d0092fcff3ef9
-DIST spectacle-18.04.2.tar.xz 1070964 BLAKE2B 59cb1e6477691c4e019b08f74f142eccfc3f1de81ba94e30e2217afad1a1a36423b7a44dc958afc9f4d9e0008c5e0d4b0cec52499bd7269e836e1728e666db8f SHA512 3f7c0aa2d8f858aff927d7ab0bbf7b0be5aecf395c09d9a0321cbaa95b34271825b8a2e4b4d2051c7e54af85f76af54fbde4740aa5bfe3ffd8c30aab5f1210da
+DIST spectacle-18.04.3.tar.xz 1073120 BLAKE2B d97d463aee43452ce2a4aeed4f016f29282f509e8fdc110c36b5f98bf7c7a751c100491be06df1d350bd060999c158c70771b2abdcf9c692c5305dee174a85b5 SHA512 c7ac9ec521162fc30a32e16597dd9309481bba1644e75df55e66fe385f27d320015f9ac0193ca333ec4dae201d634a8c99060d1145d28a7a0b5bc69f51e57e42
diff --git a/kde-apps/spectacle/spectacle-18.04.2.ebuild b/kde-apps/spectacle/spectacle-18.04.3.ebuild
similarity index 100%
rename from kde-apps/spectacle/spectacle-18.04.2.ebuild
rename to kde-apps/spectacle/spectacle-18.04.3.ebuild
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 522d9a81970c..598f83cf091f 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,2 +1,2 @@
 DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f384c11a8bed32c9084b5b31debf463645d5b1f697a62a6dc1f08a2e481246be25518cf1c526d58d0f29614a43 SHA512 40de257c593483bf1ddc84c76b8bab608d8e0ac49b0bd5acbb94a3f1bc6dba0cbe18f30d9e4d4ccdcf5e764a21209229b57abb8c3149dc9fca86fe00a732c4f3
-DIST step-18.04.2.tar.xz 862796 BLAKE2B 88ffde04ad2e044e8b58e4199672645f3694032074f39b091756d2ef0ece4e79271a7a05cda34c5e7e22967b9e38390cb440ba92568b12668579bd42e4feac9b SHA512 c0014d4d13c1c13355ea0ae4108dd085f65fc044879cdd2f47a30525b8fd37c7350df37eb6fbbf4376381b9e1e78b343fe5551cb59c2e7e4c5ba75d3864b9615
+DIST step-18.04.3.tar.xz 862512 BLAKE2B 7638798a10130f04e219c80dd953f4e226331962f56b8c11342d0181b7f42bf02cb3015bdf60a120d0d8de27dd952bc289438a1dd4196481b35da96614fca1ed SHA512 0634a5e00a8a5e631adbc1090fff41892c6846698706f685c3f4b06457b1ef991fce5539937b2eef039c8e8b13d4ddaf39a40806672d57c16f2c83a736838e79
diff --git a/kde-apps/step/step-18.04.2.ebuild b/kde-apps/step/step-18.04.3.ebuild
similarity index 100%
rename from kde-apps/step/step-18.04.2.ebuild
rename to kde-apps/step/step-18.04.3.ebuild
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index 8fa9ccfae218..d4aa4be17cf8 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,2 +1,2 @@
 DIST svgpart-17.12.3.tar.xz 20836 BLAKE2B 1c17ed56a304398cde1be7e6c9fd1faab134666c306dd871fef9bd7a8f5d777e4c909159edb7f5ed56b6b709589640fa119bb7daa4df5a88297d557215b2aa2d SHA512 fe49860728452ec4d7dc42ef5532b162f5baa1d50b83254f27f148a3fea41efb179f90162c4dc83aeaa5639cbfcca251f696ba44d63d898357d535080f4fd329
-DIST svgpart-18.04.2.tar.xz 21036 BLAKE2B b9dbb27ca3684d4da9d45ed0530a5bbd570a5f6ebadc929d57417ce544aa023265c7fe88810a754e22ab987227e24fef210aab64e41b1f35f47e2e5548d9aff9 SHA512 e6bdf471d393f0c5bcd322663f4f5273d74f95fe4154646eec8d666fd231f8f67fd00bbfbcaa898447aea5d7b569d521bc2d11e4a6b9ea0fc94713be1fdb4f18
+DIST svgpart-18.04.3.tar.xz 20972 BLAKE2B fc2a71498aebaf67966a2edc8129f888b1141520406db99d9e2143e218c2c024ebc5b54a98dcd4f7e923e89aad2c9570922a436e83149f31964057481ecd34c0 SHA512 fad16e4d9841d108cf4450b0de8b616aed3a1525966ed09043d6f83de5822c83496ffd93716c6adaee9387bcc18c95b23b4f8a7553f6d121d0f6587967dc533a
diff --git a/kde-apps/svgpart/svgpart-18.04.2.ebuild b/kde-apps/svgpart/svgpart-18.04.3.ebuild
similarity index 100%
rename from kde-apps/svgpart/svgpart-18.04.2.ebuild
rename to kde-apps/svgpart/svgpart-18.04.3.ebuild
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index e8a7371aebc3..38c30624c8be 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,2 +1,2 @@
 DIST sweeper-17.12.3.tar.xz 382244 BLAKE2B 9dae94d488241f330b04ade4b07061fd3407020ab6b246339906bdbe9599a316ba90232b2ba684e1f9b502b60347d3b3c8d47b61add4b3b62c1e200c76519eb4 SHA512 0f62ec23f3ab3d6e50787ceceef611cfc02af1c6f7a85e87f59b08f337b064ea34a5a6339f88ef909cb970ac9850eb660a03344cda4772564d4766fa6b727a95
-DIST sweeper-18.04.2.tar.xz 369192 BLAKE2B 4d431b2fb65acb4945cd1bb525e6b858dbee0567ab57b601d66ce94af58cc1f46f7bb9a68223519acf69b6c644b64367efe843c436e980a00a3358601144039c SHA512 7a754b956b52509a6c960114c34bf1ef9150ad957e09452bc4a73c794f0a8eb7c8cd3d708393d4cfb3ff5cc856dce5238ee874741832ae3cd45f3fcd10972ccd
+DIST sweeper-18.04.3.tar.xz 369048 BLAKE2B 4aba6d4403b2e90fda81ef1d79ffce4220ec68f78b2601891a76296f308e42eaabf59beaaac48dc6158ebc00882531f29b2b48df12a785a7736f9b54b43c2ac7 SHA512 d98ed3aca5ea85664c18f6d3a8e5e7055fd1cb12cd17103d75a2261dc81e6b9d4eb54400be3f8b12d2c0109edb8100a7f77353bc8c1597fd0b2a5e3625a21a0d
diff --git a/kde-apps/sweeper/sweeper-18.04.2.ebuild b/kde-apps/sweeper/sweeper-18.04.3.ebuild
similarity index 100%
rename from kde-apps/sweeper/sweeper-18.04.2.ebuild
rename to kde-apps/sweeper/sweeper-18.04.3.ebuild
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index 2e17c7efc6e4..b11c12df3049 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,2 +1,2 @@
 DIST syndication-17.12.3.tar.xz 159804 BLAKE2B bf89604b4976a28016720d74ab5c36de7bbaca08cc15c1db2d03ccad339049fae5fd06eced4e8c60ee278ad4fcaac3ceca3ee8f217839936cc79ea995f4de31f SHA512 a1f2c472194355b570e4128ab4e4be70d6baa3d1c91e35706b7ec242caa950ec3686ab20772aec6fc2ecc7b0d6b390195e6bca5ec8a130951886589df73c1f9c
-DIST syndication-18.04.2.tar.xz 160132 BLAKE2B 133d874915eea9007ec03a031a71a5aabc5cde5d1b82638bcfb69456639c126635b406ab677c85b696cd526aeacaf24fdaadd065c94e037be2dcc2cfb9453214 SHA512 658488b67d62dafa359620d95469f781d6ab0dd4789fbf0b54fc18867d2a61fa8baa7c1c1ba3e3474bb94239b0df1e864078c7619cc5b3bd2d142408647ffebd
+DIST syndication-18.04.3.tar.xz 160132 BLAKE2B cae12c0dbac27ad22afa25ad54bf70744b04ad63a73781c2a81950ae41af72ca74d0d666fc0183050237061f5e382de9ee2b6aba1b626ca6e18d799823f00356 SHA512 319ba72973cf67fb748e521100ababc4290d5a7bb9a8b26d5b288d36a1e00118faa23b92be546996ac98b1432fe719d5d8ceb9cd125d2b35d5ffd200141d2b3f
diff --git a/kde-apps/syndication/syndication-18.04.2.ebuild b/kde-apps/syndication/syndication-18.04.3.ebuild
similarity index 100%
rename from kde-apps/syndication/syndication-18.04.2.ebuild
rename to kde-apps/syndication/syndication-18.04.3.ebuild
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index c53a315d048e..1bcceb8089b4 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-thumbnailers-17.12.3.tar.xz 41628 BLAKE2B 41a95cf201d03d7ef0a4b35c9603c61113f3fbf2a5319724b88a14de979c310e2d50f2ac0fa68d60cdb7bf4d396d21d59bb60622b18ad548cd5389b68e8c0e46 SHA512 67bfea3314008d2024d07afe02b4a9b2d7d952460e831c152b6eb79b9214e73c4a90312b27f6fb02666edf2e40baa59c5c924f5750bb56d731ab09c9b2cddd6c
-DIST kdegraphics-thumbnailers-18.04.2.tar.xz 41288 BLAKE2B 520da32ff08091741b7f2809e7b0edd13adb4029ac1cfae37dee4a611689fb6fb05008e9f4b357f60a28d025b0fbe6ca603191a9d4bdb2d20a62d91d44a5a5c7 SHA512 c20f6a3157999f9cb0d98e985714c9ab6ec16e0f66486ab9cb80bbfb108ffab550db2bea6f258c823c70a711a9a9493cdfd0ea1702c4342fcc17259dc69d42c9
+DIST kdegraphics-thumbnailers-18.04.3.tar.xz 41316 BLAKE2B 336bebbb51f4b2c2650c693e71fa50ef0b08fda87ae16d7b3a4ff386d2c317ae7284eae776642eb942599e8a2a9bf504896860a704cf0d5191ed4cd68b986743 SHA512 d386f56295fdec11646ea04dfa46ad5f60ecf9c8897d6f9cbea477f95953434ea086784cf848198365701b2fe2efe4285f7a9b37fa9d98ebbca84f0859084735
diff --git a/kde-apps/thumbnailers/thumbnailers-18.04.2.ebuild b/kde-apps/thumbnailers/thumbnailers-18.04.3.ebuild
similarity index 100%
rename from kde-apps/thumbnailers/thumbnailers-18.04.2.ebuild
rename to kde-apps/thumbnailers/thumbnailers-18.04.3.ebuild
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 3a50681dcde5..5153adb01241 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,2 +1,2 @@
 DIST umbrello-17.12.3.tar.xz 2960868 BLAKE2B 1218ff36c08404312c182dddfd21179dd579e07c11b819f08333568bcd1639f56be3d85e268e2815dbdcd7576e8a33638148aa417a1a4830a85585b301912a1c SHA512 e878e4add5301ee60a11522b678c781c54582fb36d4a59451bdc4a1220559cfe4128451271198f93f0333204c3a42cbff73b75e9d6c83ecf4b75e98c4a5b12fd
-DIST umbrello-18.04.2.tar.xz 3019532 BLAKE2B 0f5bd56b23c7ef5f278e54881eccfb367b86fc5fd2b28bae7c25324fddb43bbfbd71dc55df14684850a92916fe3f535f8c586093c21c0df5b212197ca9978c35 SHA512 7143dbe7ed80bbb140ec4718fe089d51023545b2c568190b74a38b42df93a5e7b081b19053629243275d75698010fdc8d2c8ec7f5d34846283cedbc13ba1bce0
+DIST umbrello-18.04.3.tar.xz 3019628 BLAKE2B 1c2fe22828bd7716a1d9af42c6c4a2de15633933463fc553d981b0585b0a1ba0a03fe0372e5890c6189652d97084301ed36599e13eae0c39a3e25c892de94276 SHA512 fefecbdb4bc82e84f8174b45be63e195bd2fd769fd91acd6300e6eec8e4fe1c573c3043fb052682caa4772db0c3d73149d40b14cf181fe8c9889e652be03be41
diff --git a/kde-apps/umbrello/umbrello-18.04.2.ebuild b/kde-apps/umbrello/umbrello-18.04.3.ebuild
similarity index 100%
rename from kde-apps/umbrello/umbrello-18.04.2.ebuild
rename to kde-apps/umbrello/umbrello-18.04.3.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index e0f85f5ae593..585fb5209aea 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,2 +1,2 @@
 DIST zeroconf-ioslave-17.12.3.tar.xz 38576 BLAKE2B 69b06025f51c5d9c9104e60e35cfc0399dd6b0f40097174a402476630656a2a8f2ea72a14d029a92b9eebd7d4e954c1d3c96cc921c8b23002b5ff16ad7b49228 SHA512 1d41a2da78a0e161f8d31a65e6783a8ffe4820837d8e509b241916f78a046f286bbd129c116b88f98f270c61b8bb1bee358004f01d44112dfe25c391fb96c152
-DIST zeroconf-ioslave-18.04.2.tar.xz 38996 BLAKE2B 5876855a219bd8295671f8b1350299002ae8fc2ffbb1b085c4f0bed9afe70e167bfbb8592c92269f9fd96083c7454e042e08e48d5a2aebefbd09a0386bacb43c SHA512 1264ca04175d3a0b03b2031f36c451a353917ff9b8eeecfa2ef28e84b4d7ddc50138bdaef13bf4bc902d083b4f1a449e6abfe06c2631518a010406cfaed45890
+DIST zeroconf-ioslave-18.04.3.tar.xz 38980 BLAKE2B d3167ffc83c70dccf2b1a5cb44aaa307a37b05d87f4fb617319c4f7ae1c8e69182cdd1581fa60fb53b67d1b9acb8bfdaa97c8edb9b1f50c78ee768416efa3299 SHA512 f6be3f1ee9fd4300b62a57e8001df76739521a5797b99f8a3a8407f8a8a96180d2e066654f08a73e51ab7d2adbf2311d209dc2f10d2ae2abe85b3efe5e14b79e
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.2.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.3.ebuild
similarity index 100%
rename from kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.2.ebuild
rename to kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.3.ebuild
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 003b453844d7..0a12af1e704f 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 2209f0bab9dd..1103b7d9c705 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1 +1 @@
-DIST protonmail-bridge-1.0.4-1.x86_64.rpm 47422421 BLAKE2B 0846ce606feec1402e606a3b1bbe5c4431f804afc07e24689c77bcc64f211fe756a6890598e79cb6f6169a41a20158f7685b8d26a10fb91926abc77a5681ae20 SHA512 6d366ac02dec8ae3fa2bf188eff7cdaf6155c30386c76d29771362b573b3f3abc0e26df837955cb5f56d51ed1cd1b0b603911886478b5cfc7a750b2ee0077538
+DIST protonmail-bridge-1.0.5-1.x86_64.rpm 46864229 BLAKE2B bfd35880dd172dd4fc2352f28f9dc9e57049a114b15fbcc2f462c286e005276ac78b14ea2eab074f5e767aa39f6d58138d06118b8f5618d38e3aa977ceb7a725 SHA512 11a9230dd6ba9655b17cccc2a84529ea32852fe237e5174948aa711d9afe44fb3db3d29175933aa1f4dfffaf06207e6d38b815a0cce1f9d23e116a7cf9895f64
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild
deleted file mode 100644
index b00b93b20070..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/glib:2
-	media-sound/pulseaudio
-	virtual/opengl
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/usr "${D}"/ || die "Failed to copy files"
-
-	dosym "Desktop-Bridge" "/usr/bin/${PN}" || die
-
-	cat <<-EOF > "${T}/50-${PN}" || die
-		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
-	EOF
-	insinto /etc/revdep-rebuild
-	doins "${T}/50-${PN}"
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild
new file mode 100644
index 000000000000..7f63cb22441d
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.5.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-sound/pulseaudio
+	sys-apps/dbus
+	virtual/opengl
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+"
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
+	cd "${S}/usr/lib/protonmail/bridge" || die
+	patchelf --set-rpath '$ORIGIN/lib' Desktop-Bridge || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
+
+	rm "lib/libQt53DCore.so.5"
+	rm "lib/libQt53DExtras.so.5"
+	rm "lib/libQt53DInput.so.5"
+	rm "lib/libQt53DLogic.so.5"
+	rm "lib/libQt53DQuick.so.5"
+	rm "lib/libQt53DQuickExtras.so.5"
+	rm "lib/libQt53DQuickInput.so.5"
+	rm "lib/libQt53DQuickRender.so.5"
+	rm "lib/libQt53DRender.so.5"
+	rm "lib/libQt5Concurrent.so.5"
+	rm "lib/libQt5Gamepad.so.5"
+	rm "lib/libQt5QuickParticles.so.5"
+	rm "lib/libqgsttools_p.so.1"
+	rm "plugins/audio/libqtaudio_alsa.so"
+	rm "plugins/audio/libqtmedia_pulse.so"
+	rm "plugins/bearer/libqconnmanbearer.so"
+	rm "plugins/bearer/libqgenericbearer.so"
+	rm "plugins/bearer/libqnmbearer.so"
+	rm "plugins/canbus/libqtpeakcanbus.so"
+	rm "plugins/canbus/libqtsocketcanbus.so"
+	rm "plugins/canbus/libqttinycanbus.so"
+	rm "plugins/designer/libqquickwidget.so"
+	rm "plugins/designer/libqwebengineview.so"
+	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so"
+	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so"
+	rm "plugins/gamepads/libevdevgamepad.so"
+	rm "plugins/generic/libqevdevkeyboardplugin.so"
+	rm "plugins/generic/libqevdevmouseplugin.so"
+	rm "plugins/generic/libqevdevtabletplugin.so"
+	rm "plugins/generic/libqevdevtouchplugin.so"
+	rm "plugins/generic/libqtuiotouchplugin.so"
+	rm "plugins/geometryloaders/libdefaultgeometryloader.so"
+	rm "plugins/geometryloaders/libgltfgeometryloader.so"
+	rm "plugins/geoservices/libqtgeoservices_esri.so"
+	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so"
+	rm "plugins/geoservices/libqtgeoservices_mapbox.so"
+	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so"
+	rm "plugins/geoservices/libqtgeoservices_nokia.so"
+	rm "plugins/geoservices/libqtgeoservices_osm.so"
+	rm "plugins/iconengines/libqsvgicon.so"
+	rm "plugins/imageformats/libqjp2.so"
+	rm "plugins/mediaservice/libgstaudiodecoder.so"
+	rm "plugins/mediaservice/libgstcamerabin.so"
+	rm "plugins/mediaservice/libgstmediacapture.so"
+	rm "plugins/mediaservice/libgstmediaplayer.so"
+	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so"
+	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so"
+	rm "plugins/platforms/libqeglfs.so"
+	rm "plugins/platforms/libqlinuxfb.so"
+	rm "plugins/platforms/libqminimal.so"
+	rm "plugins/platforms/libqminimalegl.so"
+	rm "plugins/platforms/libqoffscreen.so"
+	rm "plugins/platforms/libqvnc.so"
+	rm "plugins/platformthemes/libqgtk3.so"
+	rm "plugins/playlistformats/libqtmultimedia_m3u.so"
+	rm "plugins/position/libqtposition_geoclue.so"
+	rm "plugins/position/libqtposition_positionpoll.so"
+	rm "plugins/printsupport/libcupsprintersupport.so"
+	rm "plugins/qmltooling/libqmldbg_debugger.so"
+	rm "plugins/qmltooling/libqmldbg_inspector.so"
+	rm "plugins/qmltooling/libqmldbg_local.so"
+	rm "plugins/qmltooling/libqmldbg_messages.so"
+	rm "plugins/qmltooling/libqmldbg_native.so"
+	rm "plugins/qmltooling/libqmldbg_nativedebugger.so"
+	rm "plugins/qmltooling/libqmldbg_profiler.so"
+	rm "plugins/qmltooling/libqmldbg_quickprofiler.so"
+	rm "plugins/qmltooling/libqmldbg_server.so"
+	rm "plugins/qmltooling/libqmldbg_tcp.so"
+	rm "plugins/renderplugins/libscene2d.so"
+	rm "plugins/sceneparsers/libassimpsceneimport.so"
+	rm "plugins/sceneparsers/libgltfsceneexport.so"
+	rm "plugins/sceneparsers/libgltfsceneimport.so"
+	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so"
+	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so"
+	rm "plugins/sensors/libqtsensors_generic.so"
+	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so"
+	rm "plugins/sensors/libqtsensors_linuxsys.so"
+	rm "plugins/sqldrivers/libqsqlite.so"
+	rm "plugins/sqldrivers/libqsqlmysql.so"
+	rm "plugins/sqldrivers/libqsqlpsql.so"
+	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so"
+	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so"
+	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so"
+	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so"
+	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so"
+	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so"
+	rm "qml/Qt3D/Animation/libquick3danimationplugin.so"
+	rm "qml/Qt3D/Core/libquick3dcoreplugin.so"
+	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so"
+	rm "qml/Qt3D/Input/libquick3dinputplugin.so"
+	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so"
+	rm "qml/Qt3D/Render/libquick3drenderplugin.so"
+	rm "qml/QtBluetooth/libdeclarative_bluetooth.so"
+	rm "qml/QtCanvas3D/libqtcanvas3d.so"
+	rm "qml/QtCharts/libqtchartsqml2.so"
+	rm "qml/QtDataVisualization/libdatavisualizationqml2.so"
+	rm "qml/QtGamepad/libdeclarative_gamepad.so"
+	rm "qml/QtLocation/libdeclarative_location.so"
+	rm "qml/QtMultimedia/libdeclarative_multimedia.so"
+	rm "qml/QtNfc/libdeclarative_nfc.so"
+	rm "qml/QtPositioning/libdeclarative_positioning.so"
+	rm "qml/QtPurchasing/libdeclarative_purchasing.so"
+	rm "qml/QtQml/Models.2/libmodelsplugin.so"
+	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so"
+	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so"
+	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so"
+	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so"
+	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so"
+	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so"
+	rm "qml/QtQuick/Dialogs/libdialogplugin.so"
+	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so"
+	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so"
+	rm "qml/QtQuick/Particles.2/libparticlesplugin.so"
+	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so"
+	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so"
+	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so"
+	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so"
+	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so"
+	rm "qml/QtScxml/libdeclarative_scxml.so"
+	rm "qml/QtSensors/libdeclarative_sensors.so"
+	rm "qml/QtTest/libqmltestplugin.so"
+	rm "qml/QtWebChannel/libdeclarative_webchannel.so"
+	rm "qml/QtWebEngine/libqtwebengineplugin.so"
+	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so"
+	rm "qml/QtWebView/libdeclarative_webview.so"
+
+	default
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/usr "${D}"/ || die "Failed to copy files"
+
+	dosym "Desktop-Bridge" "/usr/bin/${PN}" || die
+
+	cat <<-EOF > "${T}/50-${PN}" || die
+		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+	EOF
+	insinto /etc/revdep-rebuild
+	doins "${T}/50-${PN}"
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 15c71156b7e1..9166d465d64f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 9cb6aeaec196..7cda4ec101dc 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,4 @@
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 DIST harfbuzz-1.8.2.tar.bz2 3820498 BLAKE2B 7ed1509a7b54571e14d72fa097d19a56e27b3c0020243e51315ff783910319486e6c1af7cec88060c17ccf5788ff1b09f26ee4dbc879b009c983ede767e00316 SHA512 c88a3e9e55866608647318a1af7c5d848863cd894d635583b8a2d2a7a02eea875b7a5a4f0f38555d80f2e81628743e40710f5e6f9251bf629f1d15ac51103e5a
+DIST harfbuzz-1.8.3.tar.bz2 3828043 BLAKE2B 038a714480f10b05b2b31ba46667ce563598b43d122f64ab4adc6f267b2b99ea23ba92a1ae0df173be13f29da8960d55a5c5fdee25aa9fc4541a109c5e76946d SHA512 d3ec8f31ff51315fb35f6b5c69b3fbf29e1dff710fb11158801990fbeb99be5fce691f3c06df1c295a08bfb6c14021c511993b0d22ca96e76d8212ddfda198b6
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild
new file mode 100644
index 000000000000..c723137a7e55
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.8.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/lilv/lilv-0.24.2-r3.ebuild b/media-libs/lilv/lilv-0.24.2-r3.ebuild
new file mode 100644
index 000000000000..9b5c50d8fcf3
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	eapply "${FILESDIR}/includedir.patch"
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	newbashcomp utils/lilv.bash_completion ${PN}
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+}
diff --git a/media-libs/rubberband/rubberband-1.8.1-r2.ebuild b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..754ed4704a40
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.8.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}]
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	media-libs/ladspa-sdk
+	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	if ! use static-libs ; then
+		sed -e '/^all:/s/$(STATIC_TARGET)//' \
+			-e '/^\tcp $(STATIC_TARGET)/d' \
+			-i Makefile.in || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_install() {
+	emake INSTALL_BINDIR="${ED}/usr/bin" \
+		INSTALL_INCDIR="${ED}/usr/include/rubberband" \
+		INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
+		INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \
+		INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \
+		INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \
+		INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README.txt
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a85ae2d66de8..c37a7d583849 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/calf/calf-0.90.0-r1.ebuild b/media-plugins/calf/calf-0.90.0-r1.ebuild
new file mode 100644
index 000000000000..a065b446eb2b
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="http://calf-studio-gear.org/"
+
+if [[ "${PV}" = "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
+else
+	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
+
+RDEPEND="dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	media-sound/fluidsynth
+	jack? ( virtual/jack )
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+	)
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# automagic...
+	#$(use_with gtk gui)
+	#$(use_with jack)
+	econf \
+		--prefix="${EPREFIX}"/usr \
+		$(use_with lash) \
+		$(use_with lv2 lv2) \
+		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable experimental)
+}
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index 2187ab626fd5..a065b446eb2b 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,9 +45,10 @@ src_configure() {
 	#$(use_with gtk gui)
 	#$(use_with jack)
 	econf \
+		--prefix="${EPREFIX}"/usr \
 		$(use_with lash) \
 		$(use_with lv2 lv2) \
-		$(usex lv2 "--with-lv2-dir=/usr/$(get_libdir)/lv2" "") \
+		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
 		$(use_enable static-libs static) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable experimental)
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4a4acbd1dc48..f8273d8bdd27 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/elisa/elisa-0.2.1-r1.ebuild b/media-sound/elisa/elisa-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..15da92ebbfac
--- /dev/null
+++ b/media-sound/elisa/elisa-0.2.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+KDE_HANDBOOK="optional"
+QT_MINIMAL="5.11.1"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://community.kde.org/Elisa"
+LICENSE="LGPL-3+"
+IUSE="mpris semantic-desktop"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia 'gstreamer')
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	mpris? (
+		$(add_frameworks_dep kdbusaddons)
+		$(add_qt_dep qtdbus)
+	)
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package mpris KF5DBusAddons)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-sound/elisa/elisa-0.2.1.ebuild b/media-sound/elisa/elisa-0.2.1.ebuild
deleted file mode 100644
index c768c2d4d5bf..000000000000
--- a/media-sound/elisa/elisa-0.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://community.kde.org/Elisa"
-LICENSE="LGPL-3+"
-IUSE="mpris semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia 'gstreamer')
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	mpris? (
-		$(add_frameworks_dep kdbusaddons)
-		$(add_qt_dep qtdbus)
-	)
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package mpris KF5DBusAddons)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 19aa17c96e39..cab731df1871 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,2 +1,3 @@
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
+DIST pulseeffects-4.1.3.tar.gz 721527 BLAKE2B 616e341375aa71a209e8d5e3043b3013da037609ddbec595eec1f655c9a725e17f1c9359535aa4c6bf441af2e7943bef435340ecccbbd92c5022230697609a40 SHA512 416111e77a09adad9af501d4ef24482969277ac52da5d1df730995ab650e6eca46b96ec6277bada8ee8ed5bb14a09592e566d419ea19f6a87840cecdf1a79bdd
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index c9003b7aa9b2..4f7f3990a2bb 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -10,6 +10,12 @@
 		<name>Jorge Pizarro Callejas</name>
 		<description>Jorgicio Gentoo Overlay</description>
 	</maintainer>
+	<use>
+		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
+		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
+		<flag name="mda-lv2">Enable use of media-plugins/mda-lv2 for the loudness FX</flag>
+		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+	</use>
 	<longdescription lang="en">
 		Audio effects for Pulseaudio applications
 	</longdescription>
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
new file mode 100644
index 000000000000..edfa01b18d19
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+DEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? (	>=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 94b01c50ed02..73e4b4e1b2eb 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
+inherit gnome2-utils meson
 
 DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
 HOMEPAGE="https://github.com/wwmm/pulseeffects"
@@ -21,31 +19,30 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="bs2b calf mda-lv2 rubberband"
 
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
 DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
 	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
 	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
 	>=media-libs/gstreamer-1.12.0:1.0
 	>=media-libs/gst-plugins-good-1.12.0:1.0
 	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-bs2b-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
 	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
 	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
 	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	media-libs/rubberband
+	calf? (	>=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
 "
 RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
+	media-sound/pulseaudio
 "
 
 pkg_preinst(){
@@ -55,9 +52,11 @@ pkg_preinst(){
 pkg_postinst(){
 	gnome2_gconf_install
 	gnome2_schemas_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm(){
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
+	gnome2_icon_cache_update
 }
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4784757ebe72..73946bc0ab8b 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 8b60f1a0111f..eca179af48a1 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,2 +1,2 @@
-DIST gaupol-0.91.tar.gz 518493 BLAKE2B 76a01579c12084e5b7b25f9582126c33070a1df1ce230adfdea66d698830888065c8ea160da70e39550f02dc28f61d8c529aa50c2e75768ed7a2ff3e6165919f SHA512 92459ec0a7d77c8e4a34f44489ae8fc01feeb2d34f6fd152c8bfeaf72b8235c680155698c55e7f9d46ce82bee8274b14313b6a43167f65f784511e583d4858fb
+DIST gaupol-1.4.1.tar.gz 524816 BLAKE2B 677f1ee0e3b523f97d4b0f6491547d07a658c41c3c2c0f76732589592b542176761df28e13735af58371594043ef234f7987988deacd4d8f73554a87f555d001 SHA512 464e71390ba13f1da11bd40ecb4683d146acb6e547204231a2e78c24719b4ad9ba188210d1bf2108924bcfa0df89c0296f428cba693d3b6d4366e98950cb072a
 DIST gaupol-1.4.tar.gz 524369 BLAKE2B 6f27ce3328339fc2f6248bb58d80965a5a26fed220ddf9c989a5029b4322ea790f768cb9e0472bb2c5eae4e4da3abd4b0f808e785273ff9fb787ff5b7df5d137 SHA512 da9256dd8dafeaff012226a8ff09807c7cb7609c293bde7d90b05b4f75c47751e65181f1bf47dff1c8e979f48186996253141ff18e849786bf2cff5ed5555148
diff --git a/media-video/gaupol/gaupol-0.91.ebuild b/media-video/gaupol/gaupol-0.91.ebuild
deleted file mode 100644
index 0c1fd6b43f72..000000000000
--- a/media-video/gaupol/gaupol-0.91.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="spell test"
-
-RDEPEND="
-	app-text/iso-codes
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	spell? (
-		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
-		app-text/gtkspell:3
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Previewing support needs MPV, MPlayer or VLC."
-
-		if use spell; then
-			elog "Additionally, spell-checking requires a dictionary, any of"
-			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
-		fi
-	fi
-}
-
-python_test() {
-	virtx py.test
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.4.1.ebuild b/media-video/gaupol/gaupol-1.4.1.ebuild
new file mode 100644
index 000000000000..25d3dea5fb47
--- /dev/null
+++ b/media-video/gaupol/gaupol-1.4.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="https://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell test"
+
+RDEPEND="
+	app-text/iso-codes
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	spell? (
+		app-text/gtkspell:3
+		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	sys-devel/gettext
+	test? (
+		${RDEPEND}
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+
+python_test() {
+	virtx py.test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Previewing support needs MPV, MPlayer or VLC."
+
+		if use spell; then
+			elog "Additionally, spell-checking requires a dictionary, any of"
+			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 93ef3d0545d5..947101c403af 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,2 +1,3 @@
 DIST noad-0.7.3.tar.bz2 174036 BLAKE2B 11fbe9e794981b1666b04ff9d8909972a00db2daff90819d651324704836949af85278e807e7e6902b0198fd4dcd167c8722adcf816d95e15fe808efb93420a1 SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66
+DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02
 DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9
diff --git a/media-video/noad/metadata.xml b/media-video/noad/metadata.xml
index b76754b18b74..8251361a1e12 100644
--- a/media-video/noad/metadata.xml
+++ b/media-video/noad/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="libmpeg2">Support for libmpeg2 library</flag>
+		<flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg</flag>
 	</use>
 	<longdescription lang="en">
 		Mark commercial Breaks in VDR records. 
diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild
index 2a433cde6db5..3835c9d4b831 100644
--- a/media-video/noad/noad-0.7.3-r1.ebuild
+++ b/media-video/noad/noad-0.7.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Mark commercial Breaks in VDR records"
diff --git a/media-video/noad/noad-0.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r1.ebuild
index ae96bfd4fd50..60d75aed517f 100644
--- a/media-video/noad/noad-0.8.6-r1.ebuild
+++ b/media-video/noad/noad-0.8.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Mark commercial breaks in VDR recordings"
@@ -27,7 +27,7 @@ src_prepare() {
 	sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp
 
 	# tested libav-9, ffmepg-2.2.9
-	epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
+	eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
 		"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
 
 	eautoreconf
diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild
index cd819660440a..d9c62f84e4be 100644
--- a/media-video/noad/noad-0.8.6-r2.ebuild
+++ b/media-video/noad/noad-0.8.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Mark commercial breaks in VDR recordings"
@@ -31,7 +31,7 @@ src_prepare() {
 	sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp
 
 	# tested libav-9, ffmepg-2.2.9
-	epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
+	eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
 		"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
 
 	eautoreconf
diff --git a/media-video/noad/noad-0.8.6-r3.ebuild b/media-video/noad/noad-0.8.6-r3.ebuild
new file mode 100644
index 000000000000..ab6a5dbf53c8
--- /dev/null
+++ b/media-video/noad/noad-0.8.6-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Mark commercial breaks in VDR recordings"
+HOMEPAGE="http://noad.net23.net/"
+SRC_URI="http://noad.net23.net/${P}.tar.bz2
+		http://vdr.websitec.de/download/${PN}/${P}-ffmpeg3.4.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ffmpeg imagemagick libmpeg2"
+
+RDEPEND="
+	libmpeg2? ( media-libs/libmpeg2:= )
+	ffmpeg? ( virtual/ffmpeg )
+	imagemagick? ( media-gfx/imagemagick )
+	!media-plugins/vdr-markad"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
+
+src_prepare() {
+	default
+
+	#compile tested libav-13, ffmepg-3.4
+	eapply "${WORKDIR}/${P}-ffmpeg3.4.diff"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex imagemagick '--with-magick') \
+		$(usex ffmpeg '' '--without-ffmpeg') \
+		$(usex libmpeg2 '' '--without-libmpeg2') \
+		--with-tools
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"		# see bug #469810
+}
+
+src_install() {
+	dobin noad showindex checkMarks
+	use imagemagick && dobin markpics
+
+	dodoc README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
+
+	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins "${FILESDIR}"/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins "${FILESDIR}"/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe "${FILESDIR}"/noad-reccmd
+}
+
+pkg_postinst() {
+	elog
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	elog
+	elog "Note: You can use here all parameters for noad,"
+	elog "please look in the documentation of noad."
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 4eac8d16cff0..c905f7fa7b37 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,3 +1,2 @@
-DIST obs-studio-20.1.0.tar.gz 5637636 BLAKE2B 11f42c894af9d8b58ef71eda4c669b557b1b69d8df48d2414ae6d4eda1b8ecb70bb15814a302b87c5b49a43323f772a92ee5dc4a6a58302723b6b1ebf1e35123 SHA512 fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962
-DIST obs-studio-20.1.3.tar.gz 5638299 BLAKE2B 8956e0ae444c05bc452284a730ba4cba7be9209d82f8b63f9cd0455ed73411eadc61825773c6ca5fe20435082399c72d3aaf8671c3830454d9237cc92ca4450f SHA512 9d7c6892fe8940df6c1f1686f07722ea554b5996e72b702758d670a75f1220de59295c0a7b8b6445825a86623521061f64b7672bbe7526aefc9a12bab902ed74
 DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590
+DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
diff --git a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
new file mode 100644
index 000000000000..6eb7f7c3ca8d
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
@@ -0,0 +1,28 @@
+From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Sat, 17 Mar 2018 18:16:39 +0200
+Subject: [PATCH] frontend-tools: Include 'QAction' to fix build against Qt
+ 5.11
+
+Some headers are no longer unconditionally included, leading to
+build failures.
+
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
+---
+ UI/frontend-plugins/frontend-tools/scripts.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp b/UI/frontend-plugins/frontend-tools/scripts.cpp
+index d923dcf610..364757e48b 100644
+--- a/UI/frontend-plugins/frontend-tools/scripts.cpp
++++ b/UI/frontend-plugins/frontend-tools/scripts.cpp
+@@ -12,6 +12,7 @@
+ #include <QFont>
+ #include <QDialogButtonBox>
+ #include <QResizeEvent>
++#include <QAction>
+ 
+ #include <obs.hpp>
+ #include <obs-module.h>
diff --git a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
new file mode 100644
index 000000000000..2c28c8e080d5
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
@@ -0,0 +1,167 @@
+From eee6541153cfb6788ee088181781793de100e54c Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 9 Jul 2018 02:20:10 +0300
+Subject: [PATCH 1/2] deps/obs-scripting: Use less automagic for Lua/Python
+ detection
+
+This adds build-time options for disabling the Lua and/or Python
+scripting support in cases where users do not wish to build
+it, but have the required libraries installed.
+---
+ deps/obs-scripting/CMakeLists.txt | 73 +++++++++++++++++++------------
+ 1 file changed, 45 insertions(+), 28 deletions(-)
+
+diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
+index 835c1b30..46412779 100644
+--- a/deps/obs-scripting/CMakeLists.txt
++++ b/deps/obs-scripting/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+ if(NOT ENABLE_SCRIPTING)
++	message(STATUS "Scripting plugin disabled")
+ 	return()
+ endif()
+ 
+@@ -11,44 +12,60 @@ if(MSVC)
+ 		w32-pthreads)
+ endif()
+ 
+-find_package(Luajit QUIET)
+-find_package(PythonDeps QUIET)
+-find_package(SwigDeps QUIET 2)
++option(DISABLE_LUA "Disable Lua scripting support" OFF)
++option(DISABLE_PYTHON "Disable Python scripting support" OFF)
+ 
+ set(COMPILE_PYTHON FALSE CACHE BOOL "" FORCE)
+ set(COMPILE_LUA FALSE CACHE BOOL "" FORCE)
+ 
+-if(NOT SWIG_FOUND)
+-	message(STATUS "Scripting: SWIG not found; scripting disabled")
+-	return()
+-endif()
++if(NOT DISABLE_LUA)
++	find_package(Luajit QUIET)
+ 
+-if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
+-	message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
+-	return()
+-endif()
+-
+-if(NOT LUAJIT_FOUND)
+-	message(STATUS "Scripting: Luajit not found; Luajit support disabled")
++	if(NOT DISABLE_LUA AND NOT LUAJIT_FOUND)
++		message(STATUS "Luajit support not found.")
++		set(LUAJIT_FOUND FALSE)
++	else()
++		message(STATUS "Scripting: Luajit supported")
++		set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
++	endif()
+ else()
+-	message(STATUS "Scripting: Luajit supported")
+-	set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
++	message(STATUS "Scripting: Luajit support disabled")
++	set(LUAJIT_FOUND FALSE)
+ endif()
+ 
+-if(NOT PYTHONLIBS_FOUND)
+-	message(STATUS "Scripting: Python 3 not found; Python support disabled")
++if(NOT DISABLE_PYTHON)
++	find_package(PythonDeps QUIET)
++
++	if(NOT DISABLE_PYTHON AND NOT PYTHONLIBS_FOUND)
++		message(STATUS "Python support not found.")
++		set(PYTHON_FOUND FALSE)
++		set(PYTHONLIBS_FOUND FALSE)
++	else()
++		message(STATUS "Scripting: Python 3 supported")
++		set(PYTHON_FOUND TRUE)
++		set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
++
++		get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
++		string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
++
++		if(WIN32)
++			string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
++		endif()
++	endif()
++else()
++	message(STATUS "Scripting: Python 3 support disabled")
+ 	set(PYTHON_FOUND FALSE)
+ 	set(PYTHONLIBS_FOUND FALSE)
+-else()
+-	message(STATUS "Scripting: Python 3 supported")
+-	set(PYTHON_FOUND TRUE)
+-	set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
+-
+-	get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
+-	string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
+-	if(WIN32)
+-		string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
+-	endif()
++endif()
++
++find_package(SwigDeps QUIET 2)
++
++if(NOT SWIG_FOUND)
++	message(STATUS "Scripting: SWIG not found; scripting disabled")
++endif()
++
++if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
++	message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
+ endif()
+ 
+ set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
+-- 
+2.18.0
+
+From 79006adaf2b93ed4ddc07ff236a9ed1fcd09e47f Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 11 Jul 2018 02:08:51 +0300
+Subject: [PATCH 2/2] obs-filters: Use less automagic for SpeexDSP detection
+
+This adds a build-time option for disabling the SpeexDSP-based
+Noise Suppression filter support in cases where users do not
+wish to build it, but have the required library installed.
+---
+ plugins/obs-filters/CMakeLists.txt | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt
+index ec4289cc..4d862b0a 100644
+--- a/plugins/obs-filters/CMakeLists.txt
++++ b/plugins/obs-filters/CMakeLists.txt
+@@ -1,13 +1,23 @@
+ project(obs-filters)
+ 
+-find_package(Libspeexdsp QUIET)
+-if(LIBSPEEXDSP_FOUND)
+-	set(obs-filters_LIBSPEEXDSP_SOURCES
+-		noise-suppress-filter.c)
+-	set(obs-filters_LIBSPEEXDSP_LIBRARIES
+-		${LIBSPEEXDSP_LIBRARIES})
++option(DISABLE_SPEEXDSP "Disable building of the SpeexDSP-based Noise Suppression filter" OFF)
++
++if(DISABLE_SPEEXDSP)
++	message(STATUS "SpeexDSP support disabled")
++	set(LIBSPEEXDSP_FOUND FALSE)
+ else()
+-	message(STATUS "Speexdsp library not found, speexdsp filters disabled")
++	find_package(Libspeexdsp QUIET)
++
++	if(NOT LIBSPEEXDSP_FOUND)
++		message(STATUS "SpeexDSP support not found")
++		set(LIBSPEEXDSP_FOUND FALSE)
++	else()
++		message(STATUS "SpeexDSP supported")
++		set(obs-filters_LIBSPEEXDSP_SOURCES
++			noise-suppress-filter.c)
++		set(obs-filters_LIBSPEEXDSP_LIBRARIES
++			${LIBSPEEXDSP_LIBRARIES})
++	endif()
+ endif()
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/obs-filters-config.h.in"
+-- 
+2.18.0
+
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 27ed2bccb4cb..74a7f582c048 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -14,9 +14,13 @@
   <use>
     <flag name="fdk">Enable libfdk support for AAC encoding.</flag>
     <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
-    <flag name="nvenc">Enable NVENC encoding for nVidia video cards</flag>
+    <flag name="luajit">Build support for scripting via Luajit.</flag>
+    <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
+    <flag name="python">Build support for scripting via Python 3.</flag>
+    <flag name="speexdsp">Enable noise suppression filter support via
+      <pkg>media-libs/speexdsp</pkg>.</flag>
   </use>
   <upstream>
-    <remote-id type="github">jp9000/obs-studio</remote-id>
+    <remote-id type="github">obsproject/obs-studio</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-video/obs-studio/obs-studio-20.1.0.ebuild b/media-video/obs-studio/obs-studio-20.1.0.ebuild
deleted file mode 100644
index 727eac660202..000000000000
--- a/media-video/obs-studio/obs-studio-20.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
-
-COMMON_DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
-	imagemagick? (
-		|| (
-			<media-gfx/imagemagick-7
-			(
-				>=media-gfx/imagemagick-7
-				>=dev-util/cmake-3.9
-			)
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-20.1.3.ebuild b/media-video/obs-studio/obs-studio-20.1.3.ebuild
deleted file mode 100644
index 5faf60232c12..000000000000
--- a/media-video/obs-studio/obs-studio-20.1.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MIN_VERSION=3.9.6
-
-inherit cmake-utils gnome2-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
-
-COMMON_DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild
index db4647c07d16..208ad0004506 100644
--- a/media-video/obs-studio/obs-studio-21.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.0.2.ebuild
@@ -9,10 +9,10 @@ inherit cmake-utils gnome2-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
 	EGIT_SUBMODULES=()
 else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -55,6 +55,8 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
new file mode 100644
index 000000000000..062b0f414089
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+CMAKE_MIN_VERSION=3.9.6
+
+inherit cmake-utils gnome2-utils python-any-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
+
+COMMON_DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speexdsp? ( media-libs/speexdsp )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${COMMON_DEPEND}
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
+	"${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+)
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+
+	if use luajit || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !luajit)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index e030ae7b1d73..4558c2f4e954 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=6
 
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
 	EGIT_SUBMODULES=()
 else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -44,16 +45,25 @@ COMMON_DEPEND="
 	fdk? ( media-libs/fdk-aac:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
 	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speexdsp? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
@@ -64,11 +74,23 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DUNIX_STRUCTURE=1
 	)
+
+	if use luajit || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !luajit)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
 	cmake-utils_src_configure
 }
 
@@ -92,14 +114,6 @@ pkg_postinst() {
 		elog "(if 'x11-misc/xdg-utils' is installed)."
 		elog
 	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
 }
 
 pkg_postrm() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4407e14a35c4..263ae77c7253 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4f47a3f28b08..c1fd7c8a6d2f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jul 2018 03:38:28 +0000
+Fri, 13 Jul 2018 13:08:32 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4f47a3f28b08..c1fd7c8a6d2f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jul 2018 03:38:28 +0000
+Fri, 13 Jul 2018 13:08:32 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6b45fe2ffbad..c501781d998f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 96a11ef5daaa..0d6f12062525 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/consul-1.2.0 b/metadata/md5-cache/app-admin/consul-1.2.0
new file mode 100644
index 000000000000..2b789ef8841a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=6
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.2.0.tar.gz -> consul-1.2.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=77b1104cb355332c5193bd6c5d99f650
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.2 b/metadata/md5-cache/app-admin/puppet-5.5.2
index f687973665ec..b14d8b849f5a 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.2
+++ b/metadata/md5-cache/app-admin/puppet-5.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=http://puppetlabs.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.2.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=23aa33cc2bd9c115a36041827110666b
+_md5_=c75e31a164eeeb52a162cecf7266581f
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.5.3 b/metadata/md5-cache/app-admin/puppet-agent-5.5.3
index 33056fab88e4..82dddf4c62c6 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-5.5.3
+++ b/metadata/md5-cache/app-admin/puppet-agent-5.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=general puppet client utils along with mcollective hiera and facter
 EAPI=6
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.3-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.3-1stretch_i386.deb )
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1aed7da6ca73fbe01a9ba267303f228
+_md5_=07c048384fe5f8ef3d7e5b499c1dd6a6
diff --git a/metadata/md5-cache/app-admin/puppetserver-5.3.3 b/metadata/md5-cache/app-admin/puppetserver-5.3.3
index 232dfd71bfff..666a5a320aee 100644
--- a/metadata/md5-cache/app-admin/puppetserver-5.3.3
+++ b/metadata/md5-cache/app-admin/puppetserver-5.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=6
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.3.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2b3eff34a72ab686ef946e3bfd59be75
+_md5_=b84af374ead41af6acd604c5cb319caa
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 01a7f809ba96..d67fc9dbd849 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.14 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.14
deleted file mode 100644
index 191897e8a45a..000000000000
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=System performance benchmark
-EAPI=6
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.14.tar.gz -> sysbench-1.0.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4e28de46a98ce64ec8c334d97efba211
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
new file mode 100644
index 000000000000..8bb527c6fc80
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=System performance benchmark
+EAPI=6
+HOMEPAGE=https://github.com/akopytov/sysbench
+IUSE=aio mysql postgres test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+SLOT=0
+SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.15.tar.gz -> sysbench-1.0.15.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4e28de46a98ce64ec8c334d97efba211
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 18489cd16953..367c43b45e9f 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-0.26.0 b/metadata/md5-cache/app-crypt/acme-0.26.0
new file mode 100644
index 000000000000..fa2c12b08249
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1a7abec592349f646d918532d93eb3f
diff --git a/metadata/md5-cache/app-crypt/certbot-0.26.0 b/metadata/md5-cache/app-crypt/certbot-0.26.0
new file mode 100644
index 000000000000..5c1e85f06cae
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=188004de7038c831c043aa7890e5023e
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 87043b11909a..ca3b2bcb5947 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9be03bc3782ea12e224cf8d49b9a571
+_md5_=188004de7038c831c043aa7890e5023e
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.26.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.26.0
new file mode 100644
index 000000000000..894d90976d7f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d06eaba6604e6d3852e1619759ed996
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index b19a5d98d9e9..2aa49f6704f8 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f442d27c88b57bea90a18ee500037c1
+_md5_=2d06eaba6604e6d3852e1619759ed996
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.26.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.26.0
new file mode 100644
index 000000000000..6c84d1739ba6
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.26.0.tar.gz -> certbot-0.26.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0a22d3ab5aebaf2d3ded91c3fb7caa9f
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index e6a25213b1f3..eaf1c8f312a1 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.21.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c082bef19a5aa2797c0b4f6537e30186
+_md5_=0a22d3ab5aebaf2d3ded91c3fb7caa9f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 8dc9a53e3ee5..596716383430 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/containerd-1.1.1 b/metadata/md5-cache/app-emulation/containerd-1.1.1
new file mode 100644
index 000000000000..787966b03431
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.9
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=+btrfs hardened
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) sys-libs/libseccomp
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.1.1.tar.gz -> containerd-1.1.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b73d5b7f8aaceb58de8eb77d31a4139d
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.21.2 b/metadata/md5-cache/app-emulation/docker-compose-1.21.2
deleted file mode 100644
index 519718ea5d50..000000000000
--- a/metadata/md5-cache/app-emulation/docker-compose-1.21.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docker-py-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PySocks-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/PySocks-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/PySocks-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-2.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/texttable-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=6
-HOMEPAGE=https://www.docker.com/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docker-py-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PySocks-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/PySocks-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/PySocks-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-2.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/texttable-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/docker/compose/archive/1.21.2.tar.gz -> docker-compose-1.21.2.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c6227e39f8d30b2ccb53ab47d7bd8b5
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1 b/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1
new file mode 100644
index 000000000000..f56fc306245b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docker-py-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PySocks-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/PySocks-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/PySocks-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-2.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/texttable-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=6
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docker-py-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PySocks-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/PySocks-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/PySocks-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-2.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/texttable-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/1.21.2.tar.gz -> docker-compose-1.21.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbf3205e66050f53a87b6aea9d573d2c
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 0fed60fad276..49dfbf145470 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.15.0_rc3 b/metadata/md5-cache/app-metrics/alertmanager-0.15.0_rc3
deleted file mode 100644
index f7384a2087a8..000000000000
--- a/metadata/md5-cache/app-metrics/alertmanager-0.15.0_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.9
-DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/alertmanager
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.0-rc.3.tar.gz -> alertmanager-0.15.0_rc3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=952a26d487ad13e786006d14e173278c
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.15.1 b/metadata/md5-cache/app-metrics/alertmanager-0.15.1
new file mode 100644
index 000000000000..93c6bf442e81
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.15.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.1.tar.gz -> alertmanager-0.15.1.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b83b6cd34626de3a11aca0749a45f866
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.3.0 b/metadata/md5-cache/app-metrics/prometheus-2.3.0
deleted file mode 100644
index e4f4020184d7..000000000000
--- a/metadata/md5-cache/app-metrics/prometheus-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.10 dev-util/promu >=dev-lang/go-1.9
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v2.3.0.tar.gz -> prometheus-2.3.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4686a03360e6e1259e59deb845e88837
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.3.2 b/metadata/md5-cache/app-metrics/prometheus-2.3.2
new file mode 100644
index 000000000000..a1408c75b501
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.10 dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.3.2.tar.gz -> prometheus-2.3.2.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e8ed8c657187a26d2bb64296bb7ce52d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 5de4d300d316..b9ef95df9149 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.5.2 b/metadata/md5-cache/app-office/libreoffice-6.0.5.2
index e80eecc94ce8..08afe929eab7 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.5.2
@@ -4,12 +4,12 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-6.0*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-help-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-help-6.0.5.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-02.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-help-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-help-6.0.5.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8880ddf3660f1634c39df5f4a46aa197
+_md5_=b639e770028317e8726b1b4240feb252
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 7051f59d6320..dfedaaab4fae 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/zsh-5.5.1-r1 b/metadata/md5-cache/app-shells/zsh-5.5.1-r1
index db88dec093ce..903f6c9ad46c 100644
--- a/metadata/md5-cache/app-shells/zsh-5.5.1-r1
+++ b/metadata/md5-cache/app-shells/zsh-5.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=https://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 SRC_URI=https://www.zsh.org/pub/zsh-5.5.1.tar.gz doc? ( https://www.zsh.org/pub/zsh-5.5.1-doc.tar.xz )
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d55d4e5a44ff548df0ea374034f5137
+_md5_=f050c0a79d52bc24e8d00ffa4f8c0e4d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index bce96522b292..986cceb46f32 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.1 b/metadata/md5-cache/app-text/libepubgen-0.1.1
index f50150081a7e..6aa5001bdcd1 100644
--- a/metadata/md5-cache/app-text/libepubgen-0.1.1
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=EPUB generator for librevenge
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libepubgen/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.1.tar.xz
-_md5_=5937d8e6884890d6d02ea95cb0380d0e
+_md5_=7ab5c0aae9e2284a1a9bd0f47e9b3a8a
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.8 b/metadata/md5-cache/app-text/libetonyek-0.1.8
index a9c729d8e6c4..b5dc2adbca36 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.8
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.8
@@ -1,12 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:= dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.8.tar.xz
-_md5_=1249abec8caf6698fa36a9f4969e6268
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0570f65de04c5452e0b7e7b1a48eb936
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.1 b/metadata/md5-cache/app-text/libqxp-0.0.1
index 09baf4075d3e..5f0447dbb5b8 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.1
+++ b/metadata/md5-cache/app-text/libqxp-0.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=Library parsing QuarkXpress documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 IUSE=debug doc test tools
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/icu:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.1.tar.xz
-_md5_=f8d56c345a216e29daa4fda427775a6c
+_md5_=6b162727d2f6559ce963d9c9a7409bed
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index b4f6dedb180b..eaa204ea3448 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/gps-2018 b/metadata/md5-cache/dev-ada/gps-2018
new file mode 100644
index 000000000000..e1ae3d992690
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gps-2018
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools] ( dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[python] ) ) >=dev-ada/gtkada-2017 dev-ada/libadalang dev-libs/gobject-introspection dev-libs/libffi sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The GNAT Programming Studio
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/tools/gps/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools] ( dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[python] ) ) >=dev-ada/gtkada-2017 dev-ada/libadalang dev-libs/gobject-introspection dev-libs/libffi sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=95846dd93e56ef575d78394d9c9933c9
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 5687890aa12a..154ac1cd9385 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.16 b/metadata/md5-cache/dev-db/mariadb-10.2.16
index 717b2ab15f20..9a004774dade 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.16
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.16
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst preinst prepare setup t
 DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) yassl? ( net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) ) !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mariadb-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
-HOMEPAGE=http://mariadb.org/
+HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.16/source/mariadb-10.2.16.tar.gz mirror://gentoo/mysql-extras-20180515-1334Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180515-1334Z.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfd3c7a8152676c5ce367ae0c64df6fd
+_md5_=f087ea6e91a2c6cc407440ccb9c0f54b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.8 b/metadata/md5-cache/dev-db/mariadb-10.3.8
index b6946e4ed5bd..44427e2a1dae 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.8
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst preinst prepare setup t
 DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= dev-db/mariadb-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=6
-HOMEPAGE=http://mariadb.org/
+HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.8/source/mariadb-10.3.8.tar.gz mirror://gentoo/mysql-extras-20180529-0042Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180529-0042Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180529-0042Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180529-0042Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180529-0042Z.tar.bz2
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7d34ab19023c7fd9425f6d1657051da
+_md5_=0ea69b49cee6ed33889b37f398f3ac3b
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.2 b/metadata/md5-cache/dev-db/mongodb-3.6.2
deleted file mode 100644
index 530a00b5cdd8..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-3.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.2 )
-RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.2.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.2-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.2-r1
new file mode 100644
index 000000000000..ca0613642ea1
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=AGPL-3 Apache-2.0
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.2 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.2.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.3 b/metadata/md5-cache/dev-db/mongodb-3.6.3
deleted file mode 100644
index d36318126aff..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-3.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.3 )
-RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.3.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.3-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.3-r1
new file mode 100644
index 000000000000..549f4c9ec500
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=AGPL-3 Apache-2.0
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.3 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.3.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.4 b/metadata/md5-cache/dev-db/mongodb-3.6.4
deleted file mode 100644
index 8a5b3d57eeca..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-3.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.4 )
-RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.4.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.4-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.4-r1
new file mode 100644
index 000000000000..7cade42f0168
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=AGPL-3 Apache-2.0
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.4 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.4.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.5 b/metadata/md5-cache/dev-db/mongodb-3.6.5
deleted file mode 100644
index a7be34e3638a..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-3.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.5 )
-RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.5.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.5-r1 b/metadata/md5-cache/dev-db/mongodb-3.6.5-r1
new file mode 100644
index 000000000000..64717aabfff8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=AGPL-3 Apache-2.0
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.5 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.5.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=22e19879758855b6f4b0b1d569b43adf
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.0 b/metadata/md5-cache/dev-db/mongodb-4.0.0
deleted file mode 100644
index 83ff7de36259..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=6
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.0 )
-RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.0.tar.gz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aa3823b1524adddef17f4787d8fb19fd
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.0-r1 b/metadata/md5-cache/dev-db/mongodb-4.0.0-r1
new file mode 100644
index 000000000000..b01a36d92aeb
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=AGPL-3 Apache-2.0
+PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.0 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.0.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ef5984b6c1c0e5f1c207c1773b4a9399
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-3.0.10-r1 b/metadata/md5-cache/dev-db/percona-toolkit-3.0.10-r1
index dd199b1181f6..0c9acada782e 100644
--- a/metadata/md5-cache/dev-db/percona-toolkit-3.0.10-r1
+++ b/metadata/md5-cache/dev-db/percona-toolkit-3.0.10-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON de
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/percona-toolkit/3.0.10/source/tarball/percona-toolkit-3.0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=de3cc603bd03b30d88e993b61d4d2313
+_md5_=5a5cdb5a89bafb8283515c86c0014de4
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 568a95f13097..c13c1df59214 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/language-docker-2.0.1 b/metadata/md5-cache/dev-haskell/language-docker-2.0.1
deleted file mode 100644
index d16a13ccd5db..000000000000
--- a/metadata/md5-cache/dev-haskell/language-docker-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/free:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/th-lift-instances:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/language-docker#readme
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/free:=[profile?] dev-haskell/glob:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/th-lift-instances:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/2.0.1
-SRC_URI=mirror://hackage/packages/archive/language-docker/2.0.1/language-docker-2.0.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1c451a30f6ec354c00297f68c4835c66
diff --git a/metadata/md5-cache/dev-haskell/language-docker-6.0.3 b/metadata/md5-cache/dev-haskell/language-docker-6.0.3
new file mode 100644
index 000000000000..50efe83041c8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-docker-6.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/language-docker#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/6.0.3
+SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.3/language-docker-6.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 2b26b5d39546..812ce152a4f3 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/go-1.10.3 b/metadata/md5-cache/dev-lang/go-1.10.3
index 6cb00802fa93..1dd16610d734 100644
--- a/metadata/md5-cache/dev-lang/go-1.10.3
+++ b/metadata/md5-cache/dev-lang/go-1.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=https://golang.org
 IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.10.3
 SRC_URI=https://storage.googleapis.com/golang/go1.10.3.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ebf03a71d708fa20b89f4978688a63f4
+_md5_=63f99ff2cace51490868d39b15eeeb6a
diff --git a/metadata/md5-cache/dev-lang/go-1.9.7 b/metadata/md5-cache/dev-lang/go-1.9.7
index 9b615f2d0241..ae05ed4c9eab 100644
--- a/metadata/md5-cache/dev-lang/go-1.9.7
+++ b/metadata/md5-cache/dev-lang/go-1.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=https://golang.org
 IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.9.7
 SRC_URI=https://storage.googleapis.com/golang/go1.9.7.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=09807ca7fb641e75d070258d94181b56
+_md5_=65718ad024e338b856745ab34316e144
diff --git a/metadata/md5-cache/dev-lang/php-5.6.35-r1 b/metadata/md5-cache/dev-lang/php-5.6.35-r1
index 013766aad2fe..de6003ccfced 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.35-r1
+++ b/metadata/md5-cache/dev-lang/php-5.6.35-r1
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( <dev-libs/oniguruma-6.8.0:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
 SRC_URI=https://php.net/distributions/php-5.6.35.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=70d815e059efdfb9f217a3412bdc97e9
+_md5_=fd7e48951308917b4f2453e29bf8d6b2
diff --git a/metadata/md5-cache/dev-lang/php-5.6.36 b/metadata/md5-cache/dev-lang/php-5.6.36
index 719dcff29722..de484136b2d4 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.36
+++ b/metadata/md5-cache/dev-lang/php-5.6.36
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
 SRC_URI=https://php.net/distributions/php-5.6.36.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bdd059737aac72717a94a4ff622259d5
+_md5_=c1fe8b89d63b4cd3caf23a6a740675a7
diff --git a/metadata/md5-cache/dev-lang/php-7.0.29 b/metadata/md5-cache/dev-lang/php-7.0.29
index 3dce843161f6..c4a9be5e67dc 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.29
+++ b/metadata/md5-cache/dev-lang/php-7.0.29
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.0
 SRC_URI=https://secure.php.net/distributions/php-7.0.29.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=35fcd5481ed46813bf5a6b0150e7abd2
+_md5_=6d06273299000122a68469009610f66b
diff --git a/metadata/md5-cache/dev-lang/php-7.0.30 b/metadata/md5-cache/dev-lang/php-7.0.30
index 3c80fba848ed..c7ca2072f269 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.30
+++ b/metadata/md5-cache/dev-lang/php-7.0.30
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.0
 SRC_URI=https://secure.php.net/distributions/php-7.0.30.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=47f63a935a4503af5b4e7ea2b86c2664
+_md5_=7eea58a1f5844d51c05945edfb86afd0
diff --git a/metadata/md5-cache/dev-lang/php-7.1.16 b/metadata/md5-cache/dev-lang/php-7.1.16
index be03886ba85f..cfd323cfd9da 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.16
+++ b/metadata/md5-cache/dev-lang/php-7.1.16
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.1
 SRC_URI=https://secure.php.net/distributions/php-7.1.16.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bd1cf1820afe66b0551da5d2d2d1c99a
+_md5_=364eb5076207635db67f8c68381a3008
diff --git a/metadata/md5-cache/dev-lang/php-7.1.18 b/metadata/md5-cache/dev-lang/php-7.1.18
index f38af040977e..ed29909fe9c3 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.18
+++ b/metadata/md5-cache/dev-lang/php-7.1.18
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.1
 SRC_URI=https://secure.php.net/distributions/php-7.1.18.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4c046416df398722031c73c538a0a643
+_md5_=a24afb9979decd9b39d7c1e9073a7e31
diff --git a/metadata/md5-cache/dev-lang/php-7.1.19 b/metadata/md5-cache/dev-lang/php-7.1.19
index 50d66fc1f9b9..0e3eeecaadd2 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.19
+++ b/metadata/md5-cache/dev-lang/php-7.1.19
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.1
 SRC_URI=https://secure.php.net/distributions/php-7.1.19.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fb78cf258973bbb01cd5dceef5877bba
+_md5_=db1dfea9e95c4e8774e1833d0098f134
diff --git a/metadata/md5-cache/dev-lang/php-7.2.7 b/metadata/md5-cache/dev-lang/php-7.2.7
index 335fd4a3e111..255513048812 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.7
+++ b/metadata/md5-cache/dev-lang/php-7.2.7
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 ca
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.2
 SRC_URI=https://secure.php.net/distributions/php-7.2.7.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=61060f8b17458b789f20b30d92356eb1
+_md5_=643b38c9857c0600954a654e189d59f4
diff --git a/metadata/md5-cache/dev-lang/php-7.3.0_alpha1 b/metadata/md5-cache/dev-lang/php-7.3.0_alpha1
index 5fac138f6c50..99aac33538bc 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.0_alpha1
+++ b/metadata/md5-cache/dev-lang/php-7.3.0_alpha1
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 ca
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.3
 SRC_URI=https://downloads.php.net/~stas/php-7.3.0alpha1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=eb1900522e4f2ecfac1438038e6da9a9
+_md5_=f21abf628a551d67a16b3f43e489405c
diff --git a/metadata/md5-cache/dev-lang/php-7.3.0_alpha3 b/metadata/md5-cache/dev-lang/php-7.3.0_alpha3
index 8f1adc68fb1c..f6db19669616 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.0_alpha3
+++ b/metadata/md5-cache/dev-lang/php-7.3.0_alpha3
@@ -7,8 +7,8 @@ IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 ca
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.3
 SRC_URI=https://downloads.php.net/~cmb/php-7.3.0alpha3.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7dc988b9a6773c59b126818353c3a8d5
+_md5_=47d3bed92e5f84eb2a86a2a46a9ada49
diff --git a/metadata/md5-cache/dev-lang/rust-1.27.0 b/metadata/md5-cache/dev-lang/rust-1.27.0
deleted file mode 100644
index 4b8c7fe58712..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.27.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=debug doc extended +jemalloc wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-PDEPEND=!extended? ( >=dev-util/cargo-0.27.0 )
-RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=stable/1.27
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.27.0-src.tar.xz -> rustc-1.27.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.26.2-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.26.2-aarch64-unknown-linux-gnu.tar.xz )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7b999aa2c85736bef9a29a9ed214d8ea
diff --git a/metadata/md5-cache/dev-lang/rust-1.27.1 b/metadata/md5-cache/dev-lang/rust-1.27.1
new file mode 100644
index 000000000000..7c50ca8d5982
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.27.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=debug doc extended +jemalloc wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!extended? ( >=dev-util/cargo-0.27.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=stable/1.27
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.27.1-src.tar.xz -> rustc-1.27.1-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.26.2-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.26.2-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7b999aa2c85736bef9a29a9ed214d8ea
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.27.1-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.27.1-r1
new file mode 100644
index 000000000000..ea0c5da0eb2c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.27.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm pretend unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=cargo doc rustfmt
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!cargo? ( >=dev-util/cargo-0.28.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0 cargo? ( !dev-util/cargo ) rustfmt? ( !dev-util/rustfmt )
+SLOT=stable
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.27.1-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.27.1-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.27.1-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.27.1-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=815916dd2f68eb8ba73d276e5f68f339
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2c89e7686be6..528b24ba2442 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1 b/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1
new file mode 100644
index 000000000000..40d6c1270577
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libevdev-1.5.9-r1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Handler library for evdev events
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.5.9.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a354cac1105b645ab64362cba714d75e
diff --git a/metadata/md5-cache/dev-libs/libevdev-9999 b/metadata/md5-cache/dev-libs/libevdev-9999
new file mode 100644
index 000000000000..485853194d59
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libevdev-9999
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Handler library for evdev events
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a354cac1105b645ab64362cba714d75e
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
new file mode 100644
index 000000000000..3cba19368b8e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Pthread functions stubs for platforms missing them
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ba885bf8ba3ea301636788e5af522bff
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0
deleted file mode 100644
index 396f898d62ef..000000000000
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Implementation-0.50.0 >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-Text-ParseWords test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec virtual/perl-Module-Metadata >=virtual/perl-Test-Simple-0.890.0 ) dev-lang/perl:=
-DESCRIPTION=Execute code after a scope finished compilation
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/B-Hooks-EndOfScope/
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Module-Implementation-0.50.0 >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.21.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9d33da86dd6ee624009c9efbdd45de0f
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-1.210.0-r1 b/metadata/md5-cache/dev-perl/Calendar-Simple-1.210.0-r1
deleted file mode 100644
index d426a11528cd..000000000000
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-1.210.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Module-Build-0.28 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl extension to create simple calendars
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Calendar-Simple/
-IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86 ~ppc-aix
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-1.21.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8fee33765d8a1533ea3a0a10b457ad58
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index ab2ae262d5d9..eda6c37a7ad8 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0 b/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0
deleted file mode 100644
index 1a1408eaf21a..000000000000
--- a/metadata/md5-cache/dev-perl/Net-LDAP-Server-0.430.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/perl-ldap dev-perl/Convert-ASN1 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=LDAP server side protocol handling
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Net-LDAP-Server/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/perl-ldap dev-perl/Convert-ASN1 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7e778fb729003312056bc98f91aeb4a
diff --git a/metadata/md5-cache/dev-perl/UUID-0.250.0 b/metadata/md5-cache/dev-perl/UUID-0.250.0
deleted file mode 100644
index af37dd09e53b..000000000000
--- a/metadata/md5-cache/dev-perl/UUID-0.250.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker >=dev-perl/Devel-CheckLib-1.20.0 dev-lang/perl:=
-DESCRIPTION=Perl extension for using UUID interfaces as defined in e2fsprogs
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/UUID/
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JR/JRM/UUID-0.25.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=358e71ea91b041a5aef65273a0df79c5
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0
deleted file mode 100644
index aa4310e7b1cd..000000000000
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.950.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
-DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/XML-LibXSLT/
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.95.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=56ba70fade9cdb9989b57418e332c574
diff --git a/metadata/md5-cache/dev-perl/YAML-1.210.0 b/metadata/md5-cache/dev-perl/YAML-1.210.0
deleted file mode 100644
index ba059e8c0940..000000000000
--- a/metadata/md5-cache/dev-perl/YAML-1.210.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-YAML-1.50.0 ) dev-lang/perl:=
-DESCRIPTION=YAML Ain't Markup Language (tm)
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/YAML/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-1.21.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c2939ceb68e76287766bd02467d9e1a8
diff --git a/metadata/md5-cache/dev-perl/YAML-1.230.0 b/metadata/md5-cache/dev-perl/YAML-1.230.0
deleted file mode 100644
index a108fc579491..000000000000
--- a/metadata/md5-cache/dev-perl/YAML-1.230.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-YAML-1.50.0 ) dev-lang/perl:=
-DESCRIPTION=YAML Ain't Markup Language (tm)
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/YAML/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-1.23.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3ddd90d291fbd1357d619a7acf0c6248
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.700.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.700.0
deleted file mode 100644
index 8de5c26a646e..000000000000
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.700.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 >=dev-perl/JSON-MaybeXS-1.1.0 ) >=virtual/perl-File-Spec-0.80.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-Getopt-Long virtual/perl-IO virtual/perl-JSON-PP >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
-DESCRIPTION=Read/Write YAML files with as little code as possible
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/YAML-Tiny/
-IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.70.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=601cdf80da3f48aac210ace9ee575ea4
diff --git a/metadata/md5-cache/dev-perl/autobox-2.850.0 b/metadata/md5-cache/dev-perl/autobox-2.850.0
deleted file mode 100644
index c1f155cbe06d..000000000000
--- a/metadata/md5-cache/dev-perl/autobox-2.850.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Scope-Guard-0.210.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-DESCRIPTION=Call methods on native types
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/autobox/
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Scope-Guard-0.210.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.85.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9146a93c0d5a48610a3743f96a53ee1b
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.3-r1 b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
index 38155a321d85..26385658a132 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.3-r1
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7944d2e522159fe6b8aad5ec37a762b3
+_md5_=1805c2e56e7aac90e8f1232c86d45e70
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.8 b/metadata/md5-cache/dev-python/BitVector-3.4.8
new file mode 100644
index 000000000000..89ecaa1d0020
--- /dev/null
+++ b/metadata/md5-cache/dev-python/BitVector-3.4.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A pure-Python memory-efficient packed representation for bit arrays
+EAPI=6
+HOMEPAGE=https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd
+LICENSE=PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.8.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5f9d5731b91801f2af9bb43b60a637d4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4bb6d41df6ad..a3c49d15a1b1 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/atomicwrites-0.1.8 b/metadata/md5-cache/dev-python/atomicwrites-0.1.8
deleted file mode 100644
index b385ae285bff..000000000000
--- a/metadata/md5-cache/dev-python/atomicwrites-0.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Atomic file writes.
-EAPI=5
-HOMEPAGE=https://github.com/untitaker/python-atomicwrites
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-0.1.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c468ba9201cf87f5b043d8863280a1fd
diff --git a/metadata/md5-cache/dev-python/atomicwrites-0.1.9 b/metadata/md5-cache/dev-python/atomicwrites-0.1.9
deleted file mode 100644
index 3277b01f9e2c..000000000000
--- a/metadata/md5-cache/dev-python/atomicwrites-0.1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Atomic file writes.
-EAPI=6
-HOMEPAGE=https://github.com/untitaker/python-atomicwrites
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-0.1.9.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=62d66d1fcba48d924527658962ad8bb0
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3 b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
new file mode 100644
index 000000000000..63fd2196bf40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Atomic file writes
+EAPI=7
+HOMEPAGE=https://github.com/untitaker/python-atomicwrites
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.1.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a8ee7ac6995889f38a7bebb680b1d709
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.5 b/metadata/md5-cache/dev-python/autopep8-1.3.5
new file mode 100644
index 000000000000..a109380f70ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycodestyle-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pydiff-0.1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=6
+HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pep8-1.5.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycodestyle-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/autopep8/autopep8-1.3.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d00f101b03d6fdea66a59872eecbec3d
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.2.1 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.2.1
deleted file mode 100644
index 2ebe443a614a..000000000000
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rst-linker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Backport of unittest.mock
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.2.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0333b80c12e58fce9afd1c7451bef59c
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.2.1-r1 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.2.1-r1
deleted file mode 100644
index 4ed499ff1bf1..000000000000
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rst-linker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Backport of unittest.mock
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.2.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da2072219ef0b1a6bcc63e3c89fa7d5c
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.4 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
new file mode 100644
index 000000000000..9daf050567ef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Backport of unittest.mock
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=428dc1aa23e6ad884564b786856dee39
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.3 b/metadata/md5-cache/dev-python/bitarray-0.8.3
new file mode 100644
index 000000000000..1d86167b89e9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-0.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=efficient arrays of booleans -- C extension
+EAPI=6
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd
+LICENSE=PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98510925585e6cc62231f8b5a1546721
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.2 b/metadata/md5-cache/dev-python/denonavr-0.7.2
deleted file mode 100644
index 1678cb6ca08d..000000000000
--- a/metadata/md5-cache/dev-python/denonavr-0.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Automation Library for Denon AVR receivers
-EAPI=7
-HOMEPAGE=https://github.com/scarface-4711/denonavr
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7b23115e8ba4525932c7f7b5fdf6c65d
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.4 b/metadata/md5-cache/dev-python/denonavr-0.7.4
new file mode 100644
index 000000000000..6ef366d7587e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Automation Library for Denon AVR receivers
+EAPI=7
+HOMEPAGE=https://github.com/scarface-4711/denonavr
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6dab612537bfd57dd5a52e44fd6f0425
diff --git a/metadata/md5-cache/dev-python/docker-py-3.1.4 b/metadata/md5-cache/dev-python/docker-py-3.1.4
deleted file mode 100644
index 9345147e0013..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-3.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/3.1.4.tar.gz -> docker-py-3.1.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56241dfc03fb7cbd37bf7ca45f286643
diff --git a/metadata/md5-cache/dev-python/docker-py-3.2.0 b/metadata/md5-cache/dev-python/docker-py-3.2.0
deleted file mode 100644
index aa308b0b0eb1..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/3.2.0.tar.gz -> docker-py-3.2.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56241dfc03fb7cbd37bf7ca45f286643
diff --git a/metadata/md5-cache/dev-python/docker-py-3.2.1 b/metadata/md5-cache/dev-python/docker-py-3.2.1
deleted file mode 100644
index 8e6845d80780..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-3.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/3.2.1.tar.gz -> docker-py-3.2.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56241dfc03fb7cbd37bf7ca45f286643
diff --git a/metadata/md5-cache/dev-python/docker-py-3.3.0 b/metadata/md5-cache/dev-python/docker-py-3.3.0
deleted file mode 100644
index f9b26025f2bb..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/3.3.0.tar.gz -> docker-py-3.3.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df71dac575a3c49b780cb6383b707d59
diff --git a/metadata/md5-cache/dev-python/docker-py-3.4.0 b/metadata/md5-cache/dev-python/docker-py-3.4.0
deleted file mode 100644
index 3ec22e6611fd..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python client for Docker
-EAPI=6
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/docker-pycreds-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/3.4.0.tar.gz -> docker-py-3.4.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df71dac575a3c49b780cb6383b707d59
diff --git a/metadata/md5-cache/dev-python/docker-py-3.4.1 b/metadata/md5-cache/dev-python/docker-py-3.4.1
new file mode 100644
index 000000000000..d09f32125bbb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docker-py-3.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python client for Docker
+EAPI=6
+HOMEPAGE=https://github.com/docker/docker-py
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/docker-pycreds-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/docker/docker-py/archive/3.4.1.tar.gz -> docker-py-3.4.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e6d305e525490a2a03892b729050751
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.2.2 b/metadata/md5-cache/dev-python/docker-pycreds-0.2.2
deleted file mode 100644
index 5f021f121c6b..000000000000
--- a/metadata/md5-cache/dev-python/docker-pycreds-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for the docker credentials store API
-EAPI=6
-HOMEPAGE=https://github.com/shin-/dockerpy-creds/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.2.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f414caf618b25f9c2668d4929140aaf
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.3.0 b/metadata/md5-cache/dev-python/docker-pycreds-0.3.0
new file mode 100644
index 000000000000..6dc8cd1a8249
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docker-pycreds-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python bindings for the docker credentials store API
+EAPI=6
+HOMEPAGE=https://github.com/shin-/dockerpy-creds/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.3.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f414caf618b25f9c2668d4929140aaf
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
index d5e34340e845..7759cbfe89d2 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.10
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.10.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5644501929d5bcabc6b82c8ec585848a
+_md5_=81819495c3deba722df644d5bce9de27
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1 b/metadata/md5-cache/dev-python/ipython-5.4.1
deleted file mode 100644
index e07f1031ffab..000000000000
--- a/metadata/md5-cache/dev-python/ipython-5.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4177499ea4007620e18deaf6c11992c5
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1-r1 b/metadata/md5-cache/dev-python/ipython-5.4.1-r1
new file mode 100644
index 000000000000..985444c1cfe3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=6
+HOMEPAGE=http://ipython.org/
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e8a2419861d61f866a9f1fe074e574f
diff --git a/metadata/md5-cache/dev-python/ipython-6.1.0 b/metadata/md5-cache/dev-python/ipython-6.1.0
deleted file mode 100644
index 840dc03e9fbe..000000000000
--- a/metadata/md5-cache/dev-python/ipython-6.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib notebook nbconvert qt5 smp test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-6.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfb398ed076b69c2522bbf660c304b70
diff --git a/metadata/md5-cache/dev-python/ipython-6.1.0-r1 b/metadata/md5-cache/dev-python/ipython-6.1.0-r1
new file mode 100644
index 000000000000..b826028c5001
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-6.1.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=6
+HOMEPAGE=http://ipython.org/
+IUSE=doc examples matplotlib notebook nbconvert qt5 smp test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+RDEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-6.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=68927a6290f59334e6b0ec7d00e9c018
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.27.0 b/metadata/md5-cache/dev-python/m2crypto-0.27.0
index a09a62b048d7..11e992c5b4ba 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.27.0
+++ b/metadata/md5-cache/dev-python/m2crypto-0.27.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/swig-1.3.28:0 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/swig-1.3.28:0 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=M2Crypto: A Python crypto and SSL toolkit
 EAPI=6
 HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
 IUSE=libressl python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.27.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad650f4baa7089d3efa7ccb3cf4e3686
+_md5_=a9390914780cd49580bf4ac311759e7d
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.27.0-r1 b/metadata/md5-cache/dev-python/m2crypto-0.27.0-r1
deleted file mode 100644
index 33e768e75807..000000000000
--- a/metadata/md5-cache/dev-python/m2crypto-0.27.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/swig-1.3.28:0 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=M2Crypto: A Python crypto and SSL toolkit
-EAPI=6
-HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
-IUSE=libressl python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.27.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86ae82323ff731ea119ccbbf54086bf0
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2 b/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2
new file mode 100644
index 000000000000..da86f5fca020
--- /dev/null
+++ b/metadata/md5-cache/dev-python/m2crypto-0.27.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/swig-1.3.28:0 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=M2Crypto: A Python crypto and SSL toolkit
+EAPI=6
+HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
+IUSE=libressl python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.27.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aa07b3e4db68403806b61e1b3576a6cc
diff --git a/metadata/md5-cache/dev-python/promises-2.0.1 b/metadata/md5-cache/dev-python/promises-2.0.1
deleted file mode 100644
index 4aacbf91a7f2..000000000000
--- a/metadata/md5-cache/dev-python/promises-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of Promises in Python
-EAPI=6
-HOMEPAGE=https://github.com/syrusakbary/promise
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/typing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/syrusakbary/promise/archive/v2.0.1.tar.gz -> promise-2.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a4c9dc344c2568af7802bfe1dd04996
diff --git a/metadata/md5-cache/dev-python/promises-2.0.1-r1 b/metadata/md5-cache/dev-python/promises-2.0.1-r1
new file mode 100644
index 000000000000..1adb29fd3ce6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/promises-2.0.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of Promises in Python
+EAPI=6
+HOMEPAGE=https://github.com/syrusakbary/promise
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/syrusakbary/promise/archive/v2.0.1.tar.gz -> promise-2.0.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce8fa5fbc8f2d4c7e188d6efc221d436
diff --git a/metadata/md5-cache/dev-python/promises-2.1 b/metadata/md5-cache/dev-python/promises-2.1
deleted file mode 100644
index 004f7b010823..000000000000
--- a/metadata/md5-cache/dev-python/promises-2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of Promises in Python
-EAPI=6
-HOMEPAGE=https://github.com/syrusakbary/promise
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/typing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/promise/promise-2.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce9c5e1bbb1148b6bc7e0323b2d3b91d
diff --git a/metadata/md5-cache/dev-python/promises-2.1-r1 b/metadata/md5-cache/dev-python/promises-2.1-r1
new file mode 100644
index 000000000000..c49d3b47ed96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/promises-2.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of Promises in Python
+EAPI=6
+HOMEPAGE=https://github.com/syrusakbary/promise
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/promise/promise-2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ae5b6aa7eb08c673817cc05eddd5a50b
diff --git a/metadata/md5-cache/dev-python/pyfire-0.3.4-r1 b/metadata/md5-cache/dev-python/pyfire-0.3.4-r1
deleted file mode 100644
index ff4b86053767..000000000000
--- a/metadata/md5-cache/dev-python/pyfire-0.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A python implementation of the Campfire API
-EAPI=5
-HOMEPAGE=http://www.pyfire.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyfire/pyfire-0.3.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6db75d053b98a367d3ded2a91055f7df
diff --git a/metadata/md5-cache/dev-python/pyfire-0.3.4-r2 b/metadata/md5-cache/dev-python/pyfire-0.3.4-r2
new file mode 100644
index 000000000000..54f7de231c94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyfire-0.3.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A python implementation of the Campfire API
+EAPI=7
+HOMEPAGE=https://github.com/mariano/pyfire
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyfire/pyfire-0.3.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=bad0c9515ef333949f3c25a380812764
diff --git a/metadata/md5-cache/dev-python/pygments-2.2.0 b/metadata/md5-cache/dev-python/pygments-2.2.0
index 04b7ac790326..bcb8cc3bb7b5 100644
--- a/metadata/md5-cache/dev-python/pygments-2.2.0
+++ b/metadata/md5-cache/dev-python/pygments-2.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.2.0.tar.gz
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c86739871b6ad54d2556ba46ef3b96ed
+_md5_=8a658dd82f178d2dcbaacd6fb7941765
diff --git a/metadata/md5-cache/dev-python/python-afl-0.7.1 b/metadata/md5-cache/dev-python/python-afl-0.7.1
new file mode 100644
index 000000000000..19a7a1fcb5c3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-afl-0.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/cython-0.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Enables American fuzzy lop fork server and instrumentation for pure-Python code
+EAPI=6
+HOMEPAGE=https://github.com/jwilk/python-afl http://jwilk.net/software/python-afl
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-forensics/afl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-afl/python-afl-0.7.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ef7bdfef24092f1009cd8158ee82338
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.3-r3 b/metadata/md5-cache/dev-python/sphinx-1.6.3-r3
deleted file mode 100644
index 678913961b3e..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.6.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a58ee72fae9d9233656d3eeaa5cb4da
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.3-r4 b/metadata/md5-cache/dev-python/sphinx-1.6.3-r4
new file mode 100644
index 000000000000..7e933e11935e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.3-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python documentation generator
+EAPI=6
+HOMEPAGE=http://www.sphinx-doc.org/
+IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=BSD
+RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e955d435c7481fc7b256e07a3733e8fb
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.5 b/metadata/md5-cache/dev-python/sphinx-1.6.5
deleted file mode 100644
index 0641655c27aa..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ec79eeb352188b5a024c65ef05a90ed4
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.5-r1 b/metadata/md5-cache/dev-python/sphinx-1.6.5-r1
new file mode 100644
index 000000000000..aa22d861c986
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python documentation generator
+EAPI=6
+HOMEPAGE=http://www.sphinx-doc.org/
+IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f416d6bc4d1f6aa95278fd67cd72c74f
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.7 b/metadata/md5-cache/dev-python/sphinx-1.6.7
deleted file mode 100644
index 24c5d8b7aa44..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afc663a7ef193b14e49ff6a2a274d01f
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.7-r1 b/metadata/md5-cache/dev-python/sphinx-1.6.7-r1
new file mode 100644
index 000000000000..aeeae726ac95
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python documentation generator
+EAPI=6
+HOMEPAGE=http://www.sphinx-doc.org/
+IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba4d95cf1f4b72d7d014873a9b22d5bb
diff --git a/metadata/md5-cache/dev-python/sphinx-1.7.5 b/metadata/md5-cache/dev-python/sphinx-1.7.5
deleted file mode 100644
index 06f2100388a5..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-1.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python documentation generator
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
-IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.7.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9530507c5b2ab8db5916c233d225e23c
diff --git a/metadata/md5-cache/dev-python/sphinx-1.7.5-r1 b/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
new file mode 100644
index 000000000000..babb2b4bf2d4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/imagemagick-tools[jpeg,png,svg] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python documentation generator
+EAPI=6
+HOMEPAGE=http://www.sphinx-doc.org/
+IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/alabaster-0.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx_rtd_theme-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.7.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=23dc7e9d2f9eebb8cd9bf231ded36ebe
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
new file mode 100644
index 000000000000..2ce378ddf887
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.5.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Sphinx websupport extension
+EAPI=6
+HOMEPAGE=http://www.sphinx-doc.org
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=BSD-2
+PDEPEND=>=dev-python/sphinx-1.5.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c9f5de124ad04d493e00164eed114312
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.9 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.9
new file mode 100644
index 000000000000..1f17e85660c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( <dev-python/pluggy-0.7s[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=6
+HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
+IUSE=doc examples +sqlite test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef96f62b6572c3c4e8c135263fe62c3c
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0 b/metadata/md5-cache/dev-python/testscenarios-0.5.0
index 5694ee8d8c08..7198c01ede03 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.0
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/testtools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/testtools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A pyunit extension for dependency injection
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-python/testtools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.5.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b00c42c526d75755007dc3a03b78b335
+_md5_=b870783ae83d85e2d24e6b9a5e75b7cd
diff --git a/metadata/md5-cache/dev-python/testtools-2.3.0 b/metadata/md5-cache/dev-python/testtools-2.3.0
index 1427742759e8..8f4b2af583fa 100644
--- a/metadata/md5-cache/dev-python/testtools-2.3.0
+++ b/metadata/md5-cache/dev-python/testtools-2.3.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.3.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4fb39946190c842df7000847eab49f5
+_md5_=e98b21f1a060cc721176d00161a9f69a
diff --git a/metadata/md5-cache/dev-python/typing-3.6.2 b/metadata/md5-cache/dev-python/typing-3.6.2
deleted file mode 100644
index 3961e9a4cea5..000000000000
--- a/metadata/md5-cache/dev-python/typing-3.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Type Hints for Python
-EAPI=6
-HOMEPAGE=https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/typing/typing-3.6.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a7e41996b69f2db25e710ec261fcc22
diff --git a/metadata/md5-cache/dev-python/typing-3.6.2-r1 b/metadata/md5-cache/dev-python/typing-3.6.2-r1
new file mode 100644
index 000000000000..634ed1485421
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typing-3.6.2-r1
@@ -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_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Type Hints for Python
+EAPI=6
+HOMEPAGE=https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris
+LICENSE=PSF-2
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/t/typing/typing-3.6.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c1c18cde7d3540dca5b4083b7bb77cd
diff --git a/metadata/md5-cache/dev-python/typing-3.6.4 b/metadata/md5-cache/dev-python/typing-3.6.4
deleted file mode 100644
index f99cee609f34..000000000000
--- a/metadata/md5-cache/dev-python/typing-3.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Type Hints for Python
-EAPI=6
-HOMEPAGE=https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/typing/typing-3.6.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fda99b29bec37dc35675a6d4ab744e6
diff --git a/metadata/md5-cache/dev-python/typing-3.6.4-r1 b/metadata/md5-cache/dev-python/typing-3.6.4-r1
new file mode 100644
index 000000000000..8602bd6cdf42
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typing-3.6.4-r1
@@ -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_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Type Hints for Python
+EAPI=6
+HOMEPAGE=https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
+LICENSE=PSF-2
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/t/typing/typing-3.6.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=78427b1e6f8207f2c9b5a42a1c3cb814
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 24dbe8d8f07c..ff90649779e3 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtchooser-0_p20151008 b/metadata/md5-cache/dev-qt/qtchooser-0_p20151008
deleted file mode 100644
index 2f41be732c5d..000000000000
--- a/metadata/md5-cache/dev-qt/qtchooser-0_p20151008
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
-DESCRIPTION=Qt4/Qt5 version chooser
-EAPI=5
-HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=!<dev-qt/assistant-4.8.6:4 !<dev-qt/designer-4.8.6:4 !<dev-qt/linguist-4.8.6:4 !<dev-qt/pixeltool-4.8.6:4 !<dev-qt/qdbusviewer-4.8.6:4 !<dev-qt/qt3support-4.8.6:4 !<dev-qt/qtbearer-4.8.6:4 !<dev-qt/qtcore-4.8.6:4 !<dev-qt/qtdbus-4.8.6:4 !<dev-qt/qtdeclarative-4.8.6:4 !<dev-qt/qtdemo-4.8.6:4 !<dev-qt/qtgui-4.8.6:4 !<dev-qt/qthelp-4.8.6:4 !<dev-qt/qtmultimedia-4.8.6:4 !<dev-qt/qtopengl-4.8.6:4 !<dev-qt/qtopenvg-4.8.6:4 !<dev-qt/qtphonon-4.8.6:4 !<dev-qt/qtscript-4.8.6:4 !<dev-qt/qtsql-4.8.6:4 !<dev-qt/qtsvg-4.8.6:4 !<dev-qt/qttest-4.8.6:4 !<dev-qt/qtwebkit-4.8.6:4 !<dev-qt/qtxmlpatterns-4.8.6:4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qtchooser-0_p20151008.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=069c985711f2ceeabf11d30580cd1ed2
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.1 b/metadata/md5-cache/dev-qt/qtgui-5.11.1
index a4bdd8b8ac53..da5be9c75ce5 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.11.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9664649dd54f89528ce47e28da9cfe71
+_md5_=2734f4f0010dfcc331006e3462e5b096
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.1 b/metadata/md5-cache/dev-qt/qtsql-5.11.1
deleted file mode 100644
index a8af8e65b1c1..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.11.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.11.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7edee319658c3b3ab981d44b06c952bc
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1
new file mode 100644
index 000000000000..cd2934714890
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.11.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.11.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.11.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.11.1
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=cad130ed082d8b57fa6419fe924b6266
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.6 b/metadata/md5-cache/dev-qt/qtsql-5.9.6
deleted file mode 100644
index 85049e45bd47..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.9.6 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.9.6 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.9
-SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=0a11c63ad3fcfc637df75bfbadc10ef8
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.6-r1 b/metadata/md5-cache/dev-qt/qtsql-5.9.6-r1
new file mode 100644
index 000000000000..c7f63fba1baa
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.6-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.9.6 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.9.6 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.9.6
+SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=750cb7b303b23fba5665991659ba242c
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.1 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
index 60d09dd2c778..5b6b48d6ed08 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.1 )
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.1 ~dev-qt/qtdeclarative-5.11.1 ~dev-qt/qtgui-5.11.1 ~dev-qt/qtnetwork-5.11.1 ~dev-qt/qtprintsupport-5.11.1 ~dev-qt/qtwebchannel-5.11.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.1 ) geolocation? ( ~dev-qt/qtpositioning-5.11.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.1[widgets] ~dev-qt/qtwidgets-5.11.1 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=0ff0f3eab3ff5ad6cbd2c2ad7de8a25f
+_md5_=806932f1a383eecec8fe81bec5a3efd9
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1
index 31580c27c07f..fdd0d8e98b9f 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( <media-video/ffmpeg-4:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 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/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( <media-video/ffmpeg-4:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebengine-opensource-src-5.9.6.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	qt5-build	e171eb59bd29fd84761d8ee631c901d2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=75d882695dc8a26cede3fd721b14650f
+_md5_=13752965df8039f3a0d50e6e81a048bc
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 78488d712aa1..c49dc6a3037a 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/activeldap-5.2.2 b/metadata/md5-cache/dev-ruby/activeldap-5.2.2
new file mode 100644
index 000000000000..84178f97a50f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby23] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/locale[ruby_targets_ruby24] dev-ruby/ruby-gettext[ruby_targets_ruby24] dev-ruby/gettext_i18n_rails[ruby_targets_ruby24] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby24] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby25] dev-ruby/builder[ruby_targets_ruby25] dev-ruby/locale[ruby_targets_ruby25] dev-ruby/ruby-gettext[ruby_targets_ruby25] dev-ruby/gettext_i18n_rails[ruby_targets_ruby25] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby25] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
+EAPI=6
+HOMEPAGE=https://github.com/activeldap/activeldap
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby23] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/locale[ruby_targets_ruby24] dev-ruby/ruby-gettext[ruby_targets_ruby24] dev-ruby/gettext_i18n_rails[ruby_targets_ruby24] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby24] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby25] dev-ruby/builder[ruby_targets_ruby25] dev-ruby/locale[ruby_targets_ruby25] dev-ruby/ruby-gettext[ruby_targets_ruby25] dev-ruby/gettext_i18n_rails[ruby_targets_ruby25] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby25] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://rubygems/activeldap-5.2.2.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b358f0238278f7af4812c5a40d75510b
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.4.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.4.1
deleted file mode 100644
index 2562cecf9c53..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=8
-SRC_URI=mirror://rubygems/autoprefixer-rails-8.4.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c4afc443e2099b3baec8002ebb645f9
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.5.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.5.0
deleted file mode 100644
index afac4e3fe976..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=8
-SRC_URI=mirror://rubygems/autoprefixer-rails-8.5.0.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c4afc443e2099b3baec8002ebb645f9
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5
new file mode 100644
index 000000000000..9c2c0fe930d7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=6
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=8
+SRC_URI=mirror://rubygems/autoprefixer-rails-8.6.5.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3c4afc443e2099b3baec8002ebb645f9
diff --git a/metadata/md5-cache/dev-ruby/backports-3.8.0 b/metadata/md5-cache/dev-ruby/backports-3.8.0
index 99a6ec0059c2..2ffb93287a82 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.8.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Backports of Ruby features for older Ruby
 EAPI=6
 HOMEPAGE=https://github.com/marcandre/backports
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.8.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=36f68ce8730bd01132acb702d6f87467
+_md5_=fb2e2ee0b2adb79e1b4b321933e6fbe4
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.0
new file mode 100644
index 000000000000..8e9a8c0b41cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.4:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A pure Ruby DNS client library
+EAPI=6
+HOMEPAGE=https://github.com/alexdalitz/dnsruby
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/dnsruby-1.61.0.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d7b53ef356fb6749a095675c6064b854
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
index 422c8c305533..0047726a3c59 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23,sqlite] dev-ruby/temple[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails:4.2[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24,sqlite] dev-ruby/temple[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rails:5.2[ruby_targets_ruby23] dev-ruby/activerecord:5.2[ruby_targets_ruby23,sqlite] dev-ruby/temple[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails:5.2[ruby_targets_ruby24] dev-ruby/activerecord:5.2[ruby_targets_ruby24,sqlite] dev-ruby/temple[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails:5.2[ruby_targets_ruby25] dev-ruby/activerecord:5.2[ruby_targets_ruby25,sqlite] dev-ruby/temple[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=FastGettext / Rails integration
 EAPI=5
 HOMEPAGE=https://github.com/grosser/gettext_i18n_rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64
 LICENSE=public-domain
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.0.tar.gz -> gettext_i18n_rails-1.8.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2cb4ec0b8a51fd348c07b7e6239820d6
+_md5_=24061f7ebeec8303dc0787bc61a11ab6
diff --git a/metadata/md5-cache/dev-ruby/parser-2.5.1.1 b/metadata/md5-cache/dev-ruby/parser-2.5.1.1
deleted file mode 100644
index f4ddf49e252d..000000000000
--- a/metadata/md5-cache/dev-ruby/parser-2.5.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] dev-ruby/cliver[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A production-ready Ruby parser written in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/whitequark/parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/parser-2.5.1.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fe2564e5c221ec433e1af435e5014981
diff --git a/metadata/md5-cache/dev-ruby/parser-2.5.1.2 b/metadata/md5-cache/dev-ruby/parser-2.5.1.2
new file mode 100644
index 000000000000..55fd3af495b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.5.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] dev-ruby/cliver[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] dev-ruby/cliver[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=6
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/ast-2.4*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/parser-2.5.1.2.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fe2564e5c221ec433e1af435e5014981
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
new file mode 100644
index 000000000000..c99b77f801e0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A Ruby interface to some LDAP libraries
+EAPI=6
+HOMEPAGE=https://github.com/bearded/ruby-ldap
+IUSE=ssl elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
+LICENSE=BSD
+RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://rubygems/ruby-ldap-0.9.20.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fa1ae8fb0996844d61de93a7a33ae04b
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.3 b/metadata/md5-cache/dev-ruby/trollop-2.1.3
new file mode 100644
index 000000000000..c121ec7c9680
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/trollop-2.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/chronic[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/chronic[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/chronic[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Trollop is a commandline option parser for Ruby
+EAPI=6
+HOMEPAGE=https://manageiq.github.io/trollop/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=2
+SRC_URI=mirror://rubygems/trollop-2.1.3.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ed68c4f2645d1f9961aa43cb13187e6
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index fd8512023c4e..2b7e76d1f88e 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/Orange-3.4.5-r2 b/metadata/md5-cache/dev-util/Orange-3.4.5-r2
deleted file mode 100644
index 6ccb0f388c6f..000000000000
--- a/metadata/md5-cache/dev-util/Orange-3.4.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/anyqt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottleneck-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/CommonMark-0.5.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dill[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyrings_alt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pip-9.0.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqtgraph-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[webkit,svg,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/radon[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/xlrd-0.9.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.11.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scikits_learn-0.18.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Open source data visualization and analysis for novice and experts.
-EAPI=6
-HOMEPAGE=https://orange.biolab.si/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/anyqt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottleneck-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/CommonMark-0.5.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dill[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyrings_alt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pip-9.0.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqtgraph-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[webkit,svg,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/radon[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/xlrd-0.9.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.11.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scikits_learn-0.18.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/biolab/orange3/archive/3.4.5.tar.gz -> Orange-3.4.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4991d184236e5eb31b3071f950552f6c
diff --git a/metadata/md5-cache/dev-util/Orange-3.4.5-r3 b/metadata/md5-cache/dev-util/Orange-3.4.5-r3
new file mode 100644
index 000000000000..e41665002a4c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/Orange-3.4.5-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/anyqt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottleneck-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/CommonMark-0.5.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dill[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyrings_alt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pip-9.0.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqtgraph-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[webkit,svg,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/radon[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/xlrd-0.9.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.11.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scikits_learn-0.18.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source data visualization and analysis for novice and experts.
+EAPI=6
+HOMEPAGE=https://orange.biolab.si/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/anyqt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottleneck-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/CommonMark-0.5.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dill[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyrings_alt[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pip-9.0.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqtgraph-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[webkit,svg,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/radon[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/xlrd-0.9.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.11.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scikits_learn-0.18.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/biolab/orange3/archive/3.4.5.tar.gz -> Orange-3.4.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80c6372d17aeafff2389cfb327394c7d
diff --git a/metadata/md5-cache/dev-util/cucumber-3.0.2 b/metadata/md5-cache/dev-util/cucumber-3.0.2
index 809ce7f6f75e..72a292357744 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.0.2
+++ b/metadata/md5-cache/dev-util/cucumber-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.0[ruby_targets_ruby23] dev-util/cucumber-expressions:4.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.0[ruby_targets_ruby24] dev-util/cucumber-expressions:4.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.0.2.tar.gz -> cucumber-3.0.2.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e49780cc5c430abb94601614503904bc
+_md5_=74870452751e2b33bd0a6bbe64ceb1bc
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.0 b/metadata/md5-cache/dev-util/cucumber-3.1.0
index 0f025c2ee60b..bf7cf4487631 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.0.tar.gz -> cucumber-3.1.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bad46f737e34dda6e310c68add67e1db
+_md5_=3a580f41eee8b34d93430d809ff04265
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.0-r1 b/metadata/md5-cache/dev-util/cucumber-3.1.0-r1
index 9428c7f4a803..8ce857abd947 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.0.tar.gz -> cucumber-3.1.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=240e85043e52858a589e54ed9ed9f68c
+_md5_=5dcf64ad37dc4893ad19517e59bc608d
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.1 b/metadata/md5-cache/dev-util/cucumber-3.1.1
index feff962f61b3..e7e04973cae4 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:6.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:6.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:6.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.1.tar.gz -> cucumber-3.1.1.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0fbeb7918dd0cae4dcf2e00ef3d9cff3
+_md5_=0522dcd8f48678f3023db92ead6458b5
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.0.0 b/metadata/md5-cache/dev-util/cucumber-core-3.0.0
index ee3a9a1a93b7..978a0871ad1b 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby23] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby24] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3.0
 SRC_URI=mirror://rubygems/cucumber-core-3.0.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=564d434d955c6e8f19a4856cbe95167d
+_md5_=b6c17be0aa4610f933bd70e0b9431863
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.1.0-r1 b/metadata/md5-cache/dev-util/cucumber-core-3.1.0-r1
index a5de8628ec33..e81fe1022055 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.1.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby23] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby24] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby25] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby25] >=dev-ruby/gherkin-5.0.0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3.1
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.1.0.tar.gz -> cucumber-core-3.1.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3c829b09c0bcd0cf29945809b765525b
+_md5_=b580d985e8d2e828280acdb99b116184
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4 b/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4
index cdeeda9d6781..e598c47d5cec 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/cucumber-expressions-4.0.4.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4f36c9d0727932905841383a45d5021b
+_md5_=2ed17dea5b2abfa29d9598718e8e7e9f
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.18 b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.18
index 06177dccce72..ccbd23aa3936 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.18
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/cucumber-expressions-5.0.18.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cb0a2c735d59b7f30cdebc7ab07bb9fd
+_md5_=00d9e8b5b45395bf87dc46a9d29f9321
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
index 6b9005947bea..61dad6659d44 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=6.0
 SRC_URI=mirror://rubygems/cucumber-expressions-6.0.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aa91cd7d7afe54dfbcc9490368a4f782
+_md5_=fb4381ed80cd25037da69cf0bd87fa09
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index e653d14c9414..511b1421301b 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=6.0
 SRC_URI=mirror://rubygems/cucumber-expressions-6.0.1.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=aa91cd7d7afe54dfbcc9490368a4f782
+_md5_=fb4381ed80cd25037da69cf0bd87fa09
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
index 902d21199961..2481d5ef9476 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.0.1.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e90e83b5df29c1f351270629ab18e183
+_md5_=906810e4b34828fe62970a9eb90b0043
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0
index 304e510b5b3d..1445c9ef68a2 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.0.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e90e83b5df29c1f351270629ab18e183
+_md5_=906810e4b34828fe62970a9eb90b0043
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index b51bde7cdde8..dea062aec388 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.1.gem
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8e922e1524b6f1de9f988fadcd4406ed
+_md5_=4f0fa6e9438c4be90ca2a684fb3f89bb
diff --git a/metadata/md5-cache/dev-util/hadolint-1.10.2 b/metadata/md5-cache/dev-util/hadolint-1.10.2
new file mode 100644
index 000000000000..e002b6ea7d7f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hadolint-1.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile Linter JavaScript API
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/hadolint
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?]
+SLOT=0/1.10.2
+SRC_URI=mirror://hackage/packages/archive/hadolint/1.10.2/hadolint-1.10.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bdb211b1c3e2ba4fa7e0d369cfc967bb
diff --git a/metadata/md5-cache/dev-util/hadolint-1.5.0 b/metadata/md5-cache/dev-util/hadolint-1.5.0
deleted file mode 100644
index 6099f2791b77..000000000000
--- a/metadata/md5-cache/dev-util/hadolint-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/dlist:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile Linter JavaScript API
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/hadolint
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/dlist:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?]
-SLOT=0/1.5.0
-SRC_URI=mirror://hackage/packages/archive/hadolint/1.5.0/hadolint-1.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8c9a29e8960be541913c7634edff6b8c
diff --git a/metadata/md5-cache/dev-util/hadolint-1.7.2 b/metadata/md5-cache/dev-util/hadolint-1.7.2
deleted file mode 100644
index 303bcc69c32b..000000000000
--- a/metadata/md5-cache/dev-util/hadolint-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile Linter JavaScript API
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/hadolint
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?]
-SLOT=0/1.7.2
-SRC_URI=mirror://hackage/packages/archive/hadolint/1.7.2/hadolint-1.7.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d5089bdca25ee073adca1f1af1831e06
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2018.4 b/metadata/md5-cache/dev-util/spirv-tools-2018.4
index 91fe4ccc5b64..2325e8b4f8b9 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2018.4
+++ b/metadata/md5-cache/dev-util/spirv-tools-2018.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/spirv-headers sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-util/spirv-headers-1.3.1_pre20180710 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.4.tar.gz -> spirv-tools-2018.4.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1a56d435e64a70e9285006571ebe669
+_md5_=5d430708c302c66d066488274ff9dc8c
diff --git a/metadata/md5-cache/dev-util/spirv-tools-9999 b/metadata/md5-cache/dev-util/spirv-tools-9999
index 5153d85a92be..f23d30e9c647 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-9999
+++ b/metadata/md5-cache/dev-util/spirv-tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-util/spirv-headers sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-util/spirv-headers-1.3.1_pre20180710 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71636257cecc5566e9ab85150b57953b
+_md5_=1f4b55675b89b0d12acc82bc066c8004
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index f691603ce8e3..22d6f22672fd 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/emutos-0.9.9.1 b/metadata/md5-cache/games-emulation/emutos-0.9.9.1
new file mode 100644
index 000000000000..8b4476d2ec7b
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/emutos-0.9.9.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Single-user single-tasking operating system for 32 bit Atari computer emulators
+EAPI=6
+HOMEPAGE=http://emutos.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/emutos/emutos-512k-0.9.9.1.zip mirror://sourceforge/emutos/emutos-256k-0.9.9.1.zip
+_md5_=21ce29ff1dba671a4f55675d3441a505
diff --git a/metadata/md5-cache/games-emulation/hatari-1.8.0 b/metadata/md5-cache/games-emulation/hatari-1.8.0
deleted file mode 100644
index 8c441d18abd3..000000000000
--- a/metadata/md5-cache/games-emulation/hatari-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/libsdl[X,sound,video] sys-libs/readline:0 media-libs/libpng:0 sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Atari ST emulator
-EAPI=5
-HOMEPAGE=http://hatari.tuxfamily.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/libsdl[X,sound,video] sys-libs/readline:0 media-libs/libpng:0 sys-libs/zlib dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-emulation/emutos games-misc/games-envd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.tuxfamily.org/hatari/1.8.0/hatari-1.8.0.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fe230fd7a1f88701e04fbdde39e4714
diff --git a/metadata/md5-cache/games-emulation/hatari-2.1.0 b/metadata/md5-cache/games-emulation/hatari-2.1.0
new file mode 100644
index 000000000000..3c122bd0c1ac
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/hatari-2.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-emulation/caps sdl2? ( media-libs/libsdl2[X,sound,video] ) !sdl2? ( media-libs/libsdl[X,sound,video] ) media-libs/portaudio media-libs/portmidi sys-libs/readline:0= media-libs/libpng:0= sys-libs/zlib:0= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Atari ST emulator
+EAPI=6
+HOMEPAGE=http://hatari.tuxfamily.org/
+IUSE=+sdl2 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=games-emulation/emutos-0.9.9.1
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-emulation/caps sdl2? ( media-libs/libsdl2[X,sound,video] ) !sdl2? ( media-libs/libsdl[X,sound,video] ) media-libs/portaudio media-libs/portmidi sys-libs/readline:0= media-libs/libpng:0= sys-libs/zlib:0=
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/hatari/2.1.0/hatari-2.1.0.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b518ce003e9f4c93921721b7b54057e2
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 8734176cbacc..850ef79d7ae6 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/gargoyle-2011.1 b/metadata/md5-cache/games-engines/gargoyle-2011.1
deleted file mode 100644
index d6000174f2c7..000000000000
--- a/metadata/md5-cache/games-engines/gargoyle-2011.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=media-fonts/libertine-5 media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2 app-arch/unzip dev-util/ftjam virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=An Interactive Fiction (IF) player supporting all major formats
-EAPI=5
-HOMEPAGE=http://ccxvii.net/gargoyle/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2 MIT Hugo Glulxe
-RDEPEND=>=media-fonts/libertine-5 media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2 games-misc/games-envd
-SLOT=0
-SRC_URI=https://garglk.googlecode.com/files/gargoyle-2011.1-sources.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=045a4380cf714a6abd524f842220061c
diff --git a/metadata/md5-cache/games-engines/gargoyle-2011.1-r1 b/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
new file mode 100644
index 000000000000..dd374ffd9b29
--- /dev/null
+++ b/metadata/md5-cache/games-engines/gargoyle-2011.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2 app-arch/unzip dev-util/ftjam virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=An Interactive Fiction (IF) player supporting all major formats
+EAPI=6
+HOMEPAGE=http://ccxvii.net/gargoyle/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2 MIT Hugo Glulxe
+RDEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://garglk.googlecode.com/files/gargoyle-2011.1-sources.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fb8d1d3fb28ec3c71e12d0a0f95c1f4
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 915dea2e6625..38e37e9652cf 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-18.04.2
deleted file mode 100644
index 2c71e7bd91ff..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-18.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-18.04.3
new file mode 100644
index 000000000000..9ce46b3c4cd9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-18.04.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=6
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.2
deleted file mode 100644
index 692527e9efac..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-calendar-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3
new file mode 100644
index 000000000000..e71ff3dc65e1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-calendar-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c50928731851ce14a084e12975333797
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.2
deleted file mode 100644
index a3c3848a48a5..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-contacts-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3
new file mode 100644
index 000000000000..f039632af5eb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi contact integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-contacts-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7aaad4610b1b4d0cae66f4a559db7af2
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.2
deleted file mode 100644
index e9d738aecd42..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-import-wizard-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3
new file mode 100644
index 000000000000..fda19f063e4f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-import-wizard-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.2
deleted file mode 100644
index f971d6407b70..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-mime-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3
new file mode 100644
index 000000000000..ad8f5b9c4c45
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi mime types
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-mime-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ec7321744d40f46ed40df82a5b5dfc9
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.2
deleted file mode 100644
index 6a2cfaf542d8..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-apps/akonadi-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-notes-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3
new file mode 100644
index 000000000000..b8540ff94480
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-apps/akonadi-18.04.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi notes integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-notes-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.2 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.2
deleted file mode 100644
index 6b923118701c..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.04.2:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-search-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6a1a367d5ebfa724134134b3c62e845
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-18.04.3
new file mode 100644
index 000000000000..ed1cc60e11c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.04.3:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/akonadi-search.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-search-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6a1a367d5ebfa724134134b3c62e845
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.2 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.2
deleted file mode 100644
index 882423576ecc..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadiconsole-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3
new file mode 100644
index 000000000000..5882617fe8c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadiconsole-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcc0069b67079c12d2b96580aee9d23f
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.2 b/metadata/md5-cache/kde-apps/akregator-18.04.2
deleted file mode 100644
index 8fc5143f23a9..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=kde-apps/syndication-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=kde-apps/syndication-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akregator-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd9ad5f7590299b538cae07738413cde
diff --git a/metadata/md5-cache/kde-apps/akregator-18.04.3 b/metadata/md5-cache/kde-apps/akregator-18.04.3
new file mode 100644
index 000000000000..15ce40d1cd2f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=kde-apps/syndication-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=News feed aggregator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=kde-apps/syndication-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akregator-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd9ad5f7590299b538cae07738413cde
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.2 b/metadata/md5-cache/kde-apps/analitza-18.04.2
deleted file mode 100644
index a2c5f26fd505..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for mathematical features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/analitza-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/analitza-18.04.3 b/metadata/md5-cache/kde-apps/analitza-18.04.3
new file mode 100644
index 000000000000..f88607f3a1c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for mathematical features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/analitza-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.2 b/metadata/md5-cache/kde-apps/ark-18.04.2
deleted file mode 100644
index cb95ed086cd3..000000000000
--- a/metadata/md5-cache/kde-apps/ark-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Archiving tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ark-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4d9e7790a7de94a5d1eccb833b3c368
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.3 b/metadata/md5-cache/kde-apps/ark-18.04.3
new file mode 100644
index 000000000000..159c53e41c57
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Archiving tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ark-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e4d9e7790a7de94a5d1eccb833b3c368
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.2 b/metadata/md5-cache/kde-apps/artikulate-18.04.2
deleted file mode 100644
index 33370cb3b200..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/language/artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/artikulate-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.04.3 b/metadata/md5-cache/kde-apps/artikulate-18.04.3
new file mode 100644
index 000000000000..328fd8e51a8d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/language/artikulate
+IUSE=+gstreamer qtmedia debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/artikulate-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.2 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.2
deleted file mode 100644
index 1c0b0178b4f9..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=kde-apps/libkcompactdisc-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=kde-apps/libkcompactdisc-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/audiocd-kio-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3
new file mode 100644
index 000000000000..1a4632eee1ca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/libkcddb-18.04.3:5 >=kde-apps/libkcompactdisc-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/libkcddb-18.04.3:5 >=kde-apps/libkcompactdisc-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/audiocd-kio-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.2 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.2
deleted file mode 100644
index e9e4f7700632..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Widget library for baloo
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/baloo-widgets-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3
new file mode 100644
index 000000000000..cbbfd1cb0cee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Widget library for baloo
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/baloo-widgets-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.2 b/metadata/md5-cache/kde-apps/blinken-18.04.2
deleted file mode 100644
index 99c7dacc3f9f..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the Simon Says game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/blinken-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/blinken-18.04.3 b/metadata/md5-cache/kde-apps/blinken-18.04.3
new file mode 100644
index 000000000000..030d5dc845f3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the Simon Says game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/blinken-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.2 b/metadata/md5-cache/kde-apps/bomber-18.04.2
deleted file mode 100644
index 96e5cecea26e..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE arcade bombing game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bomber/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/bomber-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bomber-18.04.3 b/metadata/md5-cache/kde-apps/bomber-18.04.3
new file mode 100644
index 000000000000..1d77bfac5bfa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE arcade bombing game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bomber/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/bomber-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.2 b/metadata/md5-cache/kde-apps/bovo-18.04.2
deleted file mode 100644
index e7039c5cbb71..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bovo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/bovo-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/bovo-18.04.3 b/metadata/md5-cache/kde-apps/bovo-18.04.3
new file mode 100644
index 000000000000..498df879f780
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bovo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/bovo-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.2 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.2
deleted file mode 100644
index 04458e01711c..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-calendar-tools-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3
new file mode 100644
index 000000000000..f3c9cee035ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.2 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.2
deleted file mode 100644
index 8e8e7c52d294..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/calendarsupport-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-18.04.3
new file mode 100644
index 000000000000..fdfae4b98e0d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar support library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/calendarsupport-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.2 b/metadata/md5-cache/kde-apps/cantor-18.04.2
deleted file mode 100644
index e0b1280575ae..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-18.04.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/cantor-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cantor-18.04.3 b/metadata/md5-cache/kde-apps/cantor-18.04.3
new file mode 100644
index 000000000000..92f5cfb46718
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-18.04.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 analitza? ( >=kde-apps/analitza-18.04.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/cantor-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.2 b/metadata/md5-cache/kde-apps/cervisia-18.04.2
deleted file mode 100644
index 691e29339bd6..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=CVS frontend by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/cervisia-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.04.3 b/metadata/md5-cache/kde-apps/cervisia-18.04.3
new file mode 100644
index 000000000000..3e0a1276eecb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=CVS frontend by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/cervisia-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.2 b/metadata/md5-cache/kde-apps/dolphin-18.04.2
deleted file mode 100644
index 6a5a45448f4c..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
-IUSE=semantic-desktop thumbnail test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 >=kde-apps/baloo-widgets-18.04.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.44.0:5 ) >=kde-apps/kio-extras-18.04.2:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.04.2:5 >=kde-apps/thumbnailers-18.04.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/dolphin-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71984fd36745203584e3de12d9bd9f4d
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.3 b/metadata/md5-cache/kde-apps/dolphin-18.04.3
new file mode 100644
index 000000000000..99c77e6c80bc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-apps/baloo-widgets-18.04.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
+IUSE=semantic-desktop thumbnail test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-apps/baloo-widgets-18.04.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.46.0:5 ) >=kde-apps/kio-extras-18.04.3:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.04.3:5 >=kde-apps/thumbnailers-18.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/dolphin-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d5b54c533a94475cd0fa8e937a7b33d7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.2
deleted file mode 100644
index 55f4a6f50778..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Dolphin plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=bazaar dropbox git mercurial subversion debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/dolphin-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 ) >=kde-apps/kompare-18.04.2:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/dolphin-plugins-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3
new file mode 100644
index 000000000000..fbb73982970a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/dolphin-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Dolphin plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=bazaar dropbox git mercurial subversion debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/dolphin-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 ) >=kde-apps/kompare-18.04.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/dolphin-plugins-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.2 b/metadata/md5-cache/kde-apps/dragon-18.04.2
deleted file mode 100644
index 61b402e6651f..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A simple video player
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/dragon-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/dragon-18.04.3 b/metadata/md5-cache/kde-apps/dragon-18.04.3
new file mode 100644
index 000000000000..30019c1cc271
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A simple video player
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/dragon-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.2 b/metadata/md5-cache/kde-apps/eventviews-18.04.2
deleted file mode 100644
index 8c144e4a7744..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/eventviews-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.04.3 b/metadata/md5-cache/kde-apps/eventviews-18.04.3
new file mode 100644
index 000000000000..ee1d6b9be86c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/eventviews-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.2
deleted file mode 100644
index 8c8d4760679e..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libav debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ffmpegthumbs-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3
new file mode 100644
index 000000000000..684fb4fbd6df
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libav debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ffmpegthumbs-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.2 b/metadata/md5-cache/kde-apps/filelight-18.04.2
deleted file mode 100644
index 8eb36f12c7de..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/filelight-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/filelight-18.04.3 b/metadata/md5-cache/kde-apps/filelight-18.04.3
new file mode 100644
index 000000000000..78af3c42b789
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/filelight-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.2 b/metadata/md5-cache/kde-apps/granatier-18.04.2
deleted file mode 100644
index 6d7573ee6183..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bomberman game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/granatier/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/granatier-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/granatier-18.04.3 b/metadata/md5-cache/kde-apps/granatier-18.04.3
new file mode 100644
index 000000000000..3ff6c1bb1f60
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bomberman game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/granatier/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/granatier-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.2 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.2
deleted file mode 100644
index 55740688c948..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/grantlee-editor-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3
new file mode 100644
index 000000000000..2f14af50ca31
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/grantlee-editor-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.2 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.2
deleted file mode 100644
index c835748104b8..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/grantleetheme-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-18.04.3
new file mode 100644
index 000000000000..b5bdac0fcc70
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for Grantlee plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/grantleetheme-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.2 b/metadata/md5-cache/kde-apps/gwenview-18.04.2
deleted file mode 100644
index 4521df919921..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.2:5= ) raw? ( >=kde-apps/libkdcraw-18.04.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE image viewer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=fits kipi raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.2:5= ) raw? ( >=kde-apps/libkdcraw-18.04.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.44.0:5 >=dev-qt/qtimageformats-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/gwenview-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.04.3 b/metadata/md5-cache/kde-apps/gwenview-18.04.3
new file mode 100644
index 000000000000..551ceb477c33
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.3:5= ) raw? ( >=kde-apps/libkdcraw-18.04.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE image viewer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=fits kipi raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.04.3:5= ) raw? ( >=kde-apps/libkdcraw-18.04.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.46.0:5 >=dev-qt/qtimageformats-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/gwenview-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.2 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.2
deleted file mode 100644
index 0dd66e383a3e..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/incidenceeditor-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3
new file mode 100644
index 000000000000..e23470b14b72
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Incidence editor for korganizer
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/incidenceeditor-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.2 b/metadata/md5-cache/kde-apps/juk-18.04.2
deleted file mode 100644
index 3a49090ac671..000000000000
--- a/metadata/md5-cache/kde-apps/juk-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/juk-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/juk-18.04.3 b/metadata/md5-cache/kde-apps/juk-18.04.3
new file mode 100644
index 000000000000..e9649addb6c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/juk-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.2 b/metadata/md5-cache/kde-apps/k3b-18.04.2
deleted file mode 100644
index e9153357b291..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/K3b
-IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kfilemetadata-5.44.0:5[taglib?] >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=kde-apps/libkcddb-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/k3b-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/k3b-18.04.3 b/metadata/md5-cache/kde-apps/k3b-18.04.3
new file mode 100644
index 000000000000..45a828961347
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5[taglib?] >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-apps/libkcddb-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/K3b
+IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FDL-1.2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5[taglib?] >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-apps/libkcddb-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/k3b-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.2
deleted file mode 100644
index 14e94fa2c0fd..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.44.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kaccounts-integration-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3
new file mode 100644
index 000000000000..d859dfeeb2d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.46.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kaccounts-integration-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.2
deleted file mode 100644
index 2df52eabac10..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE accounts providers
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kpackage-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kaccounts-providers-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3
new file mode 100644
index 000000000000..a7a13cf9540d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE accounts providers
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kaccounts-providers-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.2 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.2
deleted file mode 100644
index 4d2368653b35..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.04.2:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kaddressbook-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-18.04.3
new file mode 100644
index 000000000000..9b39619abcc1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.04.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kaddressbook-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.2 b/metadata/md5-cache/kde-apps/kajongg-18.04.2
deleted file mode 100644
index 381e0a5943fc..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-18.04.2:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kajongg-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.04.3 b/metadata/md5-cache/kde-apps/kajongg-18.04.3
new file mode 100644
index 000000000000..c8c36280f481
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kajongg/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-apps/libkmahjongg-18.04.3:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kajongg-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.2 b/metadata/md5-cache/kde-apps/kalarm-18.04.2
deleted file mode 100644
index ae33ffa2fc12..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalarm-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.04.3 b/metadata/md5-cache/kde-apps/kalarm-18.04.3
new file mode 100644
index 000000000000..134f0808038b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kalarmcal-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kalarmcal-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalarm-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.2 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.2
deleted file mode 100644
index df629aba5da6..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalarmcal-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5ff6e9620557fe44bfdb1ebb2434ac8a
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-18.04.3
new file mode 100644
index 000000000000..b72480c8ccac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalarmcal-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ff6e9620557fe44bfdb1ebb2434ac8a
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.2 b/metadata/md5-cache/kde-apps/kalgebra-18.04.2
deleted file mode 100644
index 3c269ff73234..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=MathML-based graph calculator by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/analitza-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalgebra-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.04.3 b/metadata/md5-cache/kde-apps/kalgebra-18.04.3
new file mode 100644
index 000000000000..0cf366d950bb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/analitza-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=MathML-based graph calculator by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/analitza-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.46.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalgebra-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.2 b/metadata/md5-cache/kde-apps/kalzium-18.04.2
deleted file mode 100644
index 5d98c140bc42..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kunitconversion-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.44.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kalzium-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.04.3 b/metadata/md5-cache/kde-apps/kalzium-18.04.3
new file mode 100644
index 000000000000..556096aa2358
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.46.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Periodic table of the elements
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kunitconversion-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.46.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kalzium-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc3707ebf2a891099a3c0771d1cbe181
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.2 b/metadata/md5-cache/kde-apps/kamera-18.04.2
deleted file mode 100644
index 685302dabc4f..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kamera-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamera-18.04.3 b/metadata/md5-cache/kde-apps/kamera-18.04.3
new file mode 100644
index 000000000000..6ae183331279
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kamera-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.2 b/metadata/md5-cache/kde-apps/kamoso-18.04.2
deleted file mode 100644
index b84da09f1c73..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/purpose-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kamoso-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6146feb9cf4b777333466230bbc986e2
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.04.3 b/metadata/md5-cache/kde-apps/kamoso-18.04.3
new file mode 100644
index 000000000000..b6cebc6919c9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/purpose-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/purpose-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.46.0:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kamoso-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6146feb9cf4b777333466230bbc986e2
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.2 b/metadata/md5-cache/kde-apps/kanagram-18.04.2
deleted file mode 100644
index 07c545f84167..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on anagrams of words
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.04.2:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kanagram-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.04.3 b/metadata/md5-cache/kde-apps/kanagram-18.04.3
new file mode 100644
index 000000000000..752ba993f971
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on anagrams of words
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.04.3:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kanagram-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.2 b/metadata/md5-cache/kde-apps/kapman-18.04.2
deleted file mode 100644
index 3ed7c7c2e3fb..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kapman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kapman-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapman-18.04.3 b/metadata/md5-cache/kde-apps/kapman-18.04.3
new file mode 100644
index 000000000000..6a47ffa33862
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kapman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kapman-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.2 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.2
deleted file mode 100644
index e580afcb3306..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kapptemplate-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-18.04.3
new file mode 100644
index 000000000000..fcb81bb973f2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kapptemplate-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.2 b/metadata/md5-cache/kde-apps/kate-18.04.2
deleted file mode 100644
index ef955b7dc2da..000000000000
--- a/metadata/md5-cache/kde-apps/kate-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kate is an advanced text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
-IUSE=+addons test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kate-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfaae2d0cb2cfd1e2a96c6e28042bb03
diff --git a/metadata/md5-cache/kde-apps/kate-18.04.3 b/metadata/md5-cache/kde-apps/kate-18.04.3
new file mode 100644
index 000000000000..0872aa3a369c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtsql-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kate is an advanced text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
+IUSE=+addons test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kate-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=150b0661615d896c7333162f34e241c2
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.2 b/metadata/md5-cache/kde-apps/katomic-18.04.2
deleted file mode 100644
index 5a6e3ff5acba..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/katomic-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/katomic-18.04.3 b/metadata/md5-cache/kde-apps/katomic-18.04.3
new file mode 100644
index 000000000000..a38f05e2751a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/katomic-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.2 b/metadata/md5-cache/kde-apps/kbackup-18.04.2
deleted file mode 100644
index fc3ea46c55a6..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbackup-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.04.3 b/metadata/md5-cache/kde-apps/kbackup-18.04.3
new file mode 100644
index 000000000000..443851e65744
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbackup-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=993ec9361abad4d3a7639df6412f173a
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.2 b/metadata/md5-cache/kde-apps/kblackbox-18.04.2
deleted file mode 100644
index 5f8b36d841ac..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Blackbox Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kblackbox-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.04.3 b/metadata/md5-cache/kde-apps/kblackbox-18.04.3
new file mode 100644
index 000000000000..996431eca84a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Blackbox Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblackbox-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.2 b/metadata/md5-cache/kde-apps/kblocks-18.04.2
deleted file mode 100644
index b3a0533130f0..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A single-player Tetris-like KDE game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kblocks/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kblocks-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.04.3 b/metadata/md5-cache/kde-apps/kblocks-18.04.3
new file mode 100644
index 000000000000..ef44ea0aaf94
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A single-player Tetris-like KDE game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kblocks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblocks-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.2 b/metadata/md5-cache/kde-apps/kblog-18.04.2
deleted file mode 100644
index c1f2709d0b92..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/syndication-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlrpcclient-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/syndication-18.04.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kblog-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kblog-18.04.3 b/metadata/md5-cache/kde-apps/kblog-18.04.3
new file mode 100644
index 000000000000..c6380580d39b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/syndication-18.04.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing client-side support for web application remote blogging APIs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/syndication-18.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kblog-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.2 b/metadata/md5-cache/kde-apps/kbounce-18.04.2
deleted file mode 100644
index b568f8c6688c..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbounce-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.04.3 b/metadata/md5-cache/kde-apps/kbounce-18.04.3
new file mode 100644
index 000000000000..86b9c75b652c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbounce-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.2 b/metadata/md5-cache/kde-apps/kbreakout-18.04.2
deleted file mode 100644
index dbba6d5a83db..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breakout-like game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbreakout-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.04.3 b/metadata/md5-cache/kde-apps/kbreakout-18.04.3
new file mode 100644
index 000000000000..1f56feba300f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breakout-like game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbreakout-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.2 b/metadata/md5-cache/kde-apps/kbruch-18.04.2
deleted file mode 100644
index 41681a4a05d6..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kbruch-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.04.3 b/metadata/md5-cache/kde-apps/kbruch-18.04.3
new file mode 100644
index 000000000000..dfa19c06d294
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kbruch-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.2 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.2
deleted file mode 100644
index 04dc7e96c4fd..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcachegrind-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-18.04.3
new file mode 100644
index 000000000000..3805da967a9a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcachegrind-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.2 b/metadata/md5-cache/kde-apps/kcalc-18.04.2
deleted file mode 100644
index d78731ecd877..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE calculator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcalc-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.04.3 b/metadata/md5-cache/kde-apps/kcalc-18.04.3
new file mode 100644
index 000000000000..e48a00fa8c5e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE calculator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcalc-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.2 b/metadata/md5-cache/kde-apps/kcalcore-18.04.2
deleted file mode 100644
index 053e1ee73c6e..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcalcore-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.04.3 b/metadata/md5-cache/kde-apps/kcalcore-18.04.3
new file mode 100644
index 000000000000..7c9bcd77f778
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcalcore-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.2 b/metadata/md5-cache/kde-apps/kcalutils-18.04.2
deleted file mode 100644
index c7cdcd5fba1c..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcalutils-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66aa061c6257be3beef11c05668d21e3
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.04.3 b/metadata/md5-cache/kde-apps/kcalutils-18.04.3
new file mode 100644
index 000000000000..c2072c094a31
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcalutils-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66aa061c6257be3beef11c05668d21e3
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.2 b/metadata/md5-cache/kde-apps/kcharselect-18.04.2
deleted file mode 100644
index f71ea8bee3ff..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE character selection utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcharselect-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.04.3 b/metadata/md5-cache/kde-apps/kcharselect-18.04.3
new file mode 100644
index 000000000000..10f0c4636317
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE character selection utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcharselect-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.2 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.2
deleted file mode 100644
index 70e27e192f88..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE color selector/editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcolorchooser-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3
new file mode 100644
index 000000000000..622fb3361191
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE color selector/editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcolorchooser-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.2 b/metadata/md5-cache/kde-apps/kcontacts-18.04.2
deleted file mode 100644
index 87d9fa7dc863..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcontacts-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d76ea0ff094b31e51891250dcd41b6a
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.04.3 b/metadata/md5-cache/kde-apps/kcontacts-18.04.3
new file mode 100644
index 000000000000..82f6e3613950
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcontacts-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d76ea0ff094b31e51891250dcd41b6a
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.2 b/metadata/md5-cache/kde-apps/kcron-18.04.2
deleted file mode 100644
index ffec17398ad3..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Task Scheduler
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kcron-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kcron-18.04.3 b/metadata/md5-cache/kde-apps/kcron-18.04.3
new file mode 100644
index 000000000000..e597d2f34a0f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Task Scheduler
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kcron-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17702ace70463c5f6dbefc33d0f1cbcc
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.2 b/metadata/md5-cache/kde-apps/kdav-18.04.2
deleted file mode 100644
index dc71967daf59..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdav-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kdav-18.04.3 b/metadata/md5-cache/kde-apps/kdav-18.04.3
new file mode 100644
index 000000000000..c267d467e654
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdav-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.2
deleted file mode 100644
index c34f163585f8..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-18.04.2 >=kde-apps/kdeadmin-meta-18.04.2 >=kde-apps/kdecore-meta-18.04.2 >=kde-apps/kdeedu-meta-18.04.2 >=kde-apps/kdegames-meta-18.04.2 >=kde-apps/kdegraphics-meta-18.04.2 >=kde-apps/kdemultimedia-meta-18.04.2 >=kde-apps/kdenetwork-meta-18.04.2 >=kde-apps/kdeutils-meta-18.04.2 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.2 ) pim? ( >=kde-apps/kdepim-meta-18.04.2 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.2 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3
new file mode 100644
index 000000000000..dd1052f23929
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kate-18.04.3 >=kde-apps/kdeadmin-meta-18.04.3 >=kde-apps/kdecore-meta-18.04.3 >=kde-apps/kdeedu-meta-18.04.3 >=kde-apps/kdegames-meta-18.04.3 >=kde-apps/kdegraphics-meta-18.04.3 >=kde-apps/kdemultimedia-meta-18.04.3 >=kde-apps/kdenetwork-meta-18.04.3 >=kde-apps/kdeutils-meta-18.04.3 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.04.3 ) pim? ( >=kde-apps/kdepim-meta-18.04.3 ) sdk? ( >=kde-apps/kdesdk-meta-18.04.3 ) !kde-apps/kde-apps-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.2
deleted file mode 100644
index 45b972e6dcfa..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kde-dev-scripts-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3
new file mode 100644
index 000000000000..4eac2e1f13e2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdoctools-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kde-dev-scripts-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.2
deleted file mode 100644
index 5facf64593b4..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Utilities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kde-dev-utils-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3
new file mode 100644
index 000000000000..4faa11bada71
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Utilities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kde-dev-utils-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.2 b/metadata/md5-cache/kde-apps/kde-meta-18.04.2
deleted file mode 100644
index a84e01b2a580..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-18.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-18.04.2 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.04.3 b/metadata/md5-cache/kde-apps/kde-meta-18.04.3
new file mode 100644
index 000000000000..43d90840c17a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.04.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-18.04.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.2
deleted file mode 100644
index 766ed4c791e4..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-18.04.2 >=kde-apps/kmousetool-18.04.2 >=kde-apps/kmouth-18.04.2 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3
new file mode 100644
index 000000000000..442f5f4573f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.04.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-18.04.3 >=kde-apps/kmousetool-18.04.3 >=kde-apps/kmouth-18.04.3 !kde-apps/kdeaccessibility-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.2
deleted file mode 100644
index b4cb9f53c9c3..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-18.04.2 cron? ( >=kde-apps/kcron-18.04.2 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3
new file mode 100644
index 000000000000..16705d9633f3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-18.04.3 cron? ( >=kde-apps/kcron-18.04.3 ) !kde-apps/kdeadmin-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.2
deleted file mode 100644
index c253f3abcd38..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-18.04.2 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3
new file mode 100644
index 000000000000..5e5ec219a412
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.04.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-18.04.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.2 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.2
deleted file mode 100644
index feb4b50937a0..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdebugsettings-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3
new file mode 100644
index 000000000000..373d197eba3d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdebugsettings-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.2
deleted file mode 100644
index 806b56c46f88..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-18.04.2 >=kde-apps/kdialog-18.04.2 >=kde-apps/keditbookmarks-18.04.2 >=kde-apps/kfind-18.04.2 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.2 ) >=kde-apps/konsole-18.04.2 >=kde-apps/kwrite-18.04.2 handbook? ( >=kde-apps/khelpcenter-18.04.2 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9bae73c549428796596a722374cb8938
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3
new file mode 100644
index 000000000000..2373886e3f55
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-18.04.3 >=kde-apps/kdialog-18.04.3 >=kde-apps/keditbookmarks-18.04.3 >=kde-apps/kfind-18.04.3 || ( www-client/falkon www-client/qupzilla >=kde-apps/konqueror-18.04.3 ) >=kde-apps/konsole-18.04.3 >=kde-apps/kwrite-18.04.3 handbook? ( >=kde-apps/khelpcenter-18.04.3 ) !kde-apps/kdecore-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9bae73c549428796596a722374cb8938
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.2 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.2
deleted file mode 100644
index bb4153d8da9c..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdeedu-data-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3
new file mode 100644
index 000000000000..1349b7cffd07
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.04.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdeedu-data-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.2
deleted file mode 100644
index bad3e1577c49..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=6
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-18.04.2 >=kde-apps/artikulate-18.04.2 >=kde-apps/blinken-18.04.2 >=kde-apps/cantor-18.04.2 >=kde-apps/kalzium-18.04.2 >=kde-apps/kanagram-18.04.2 >=kde-apps/kbruch-18.04.2 >=kde-apps/kdeedu-data-18.04.2 >=kde-apps/kgeography-18.04.2 >=kde-apps/khangman-18.04.2 >=kde-apps/kig-18.04.2 >=kde-apps/kiten-18.04.2 >=kde-apps/klettres-18.04.2 >=kde-apps/kmplot-18.04.2 >=kde-apps/kqtquickcharts-18.04.2 >=kde-apps/ktouch-18.04.2 >=kde-apps/kturtle-18.04.2 >=kde-apps/kwordquiz-18.04.2 >=kde-apps/libkeduvocdocument-18.04.2 >=kde-apps/marble-18.04.2 >=kde-apps/minuet-18.04.2 >=kde-apps/rocs-18.04.2 >=kde-apps/step-18.04.2 webengine? ( >=kde-apps/kalgebra-18.04.2 >=kde-apps/parley-18.04.2 ) !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=916f4ff673e41d1868eff4da4ada06e0
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3
new file mode 100644
index 000000000000..3d7875f773b9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=6
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-18.04.3 >=kde-apps/artikulate-18.04.3 >=kde-apps/blinken-18.04.3 >=kde-apps/cantor-18.04.3 >=kde-apps/kalzium-18.04.3 >=kde-apps/kanagram-18.04.3 >=kde-apps/kbruch-18.04.3 >=kde-apps/kdeedu-data-18.04.3 >=kde-apps/kgeography-18.04.3 >=kde-apps/khangman-18.04.3 >=kde-apps/kig-18.04.3 >=kde-apps/kiten-18.04.3 >=kde-apps/klettres-18.04.3 >=kde-apps/kmplot-18.04.3 >=kde-apps/kqtquickcharts-18.04.3 >=kde-apps/ktouch-18.04.3 >=kde-apps/kturtle-18.04.3 >=kde-apps/kwordquiz-18.04.3 >=kde-apps/libkeduvocdocument-18.04.3 >=kde-apps/marble-18.04.3 >=kde-apps/minuet-18.04.3 >=kde-apps/rocs-18.04.3 >=kde-apps/step-18.04.3 webengine? ( >=kde-apps/kalgebra-18.04.3 >=kde-apps/parley-18.04.3 ) !kde-apps/kdeedu-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=916f4ff673e41d1868eff4da4ada06e0
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.2
deleted file mode 100644
index 562fbf6c6b40..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=6
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-18.04.2 >=kde-apps/bovo-18.04.2 >=kde-apps/granatier-18.04.2 >=kde-apps/kapman-18.04.2 >=kde-apps/katomic-18.04.2 >=kde-apps/kblackbox-18.04.2 >=kde-apps/kblocks-18.04.2 >=kde-apps/kbounce-18.04.2 >=kde-apps/kbreakout-18.04.2 >=kde-apps/kdiamond-18.04.2 >=kde-apps/kfourinline-18.04.2 >=kde-apps/kgoldrunner-18.04.2 >=kde-apps/kigo-18.04.2 >=kde-apps/killbots-18.04.2 >=kde-apps/kiriki-18.04.2 >=kde-apps/kjumpingcube-18.04.2 >=kde-apps/klickety-18.04.2 >=kde-apps/klines-18.04.2 >=kde-apps/kmahjongg-18.04.2 >=kde-apps/kmines-18.04.2 >=kde-apps/knavalbattle-18.04.2 >=kde-apps/knetwalk-18.04.2 >=kde-apps/kolf-18.04.2 >=kde-apps/kollision-18.04.2 >=kde-apps/konquest-18.04.2 >=kde-apps/kpat-18.04.2 >=kde-apps/kreversi-18.04.2 >=kde-apps/kshisen-18.04.2 >=kde-apps/ksirk-18.04.2 >=kde-apps/ksnakeduel-18.04.2 >=kde-apps/kspaceduel-18.04.2 >=kde-apps/ksquares-18.04.2 >=kde-apps/ktuberling-18.04.2 >=kde-apps/libkdegames-18.04.2 >=kde-apps/libkmahjongg-18.04.2 >=kde-apps/lskat-18.04.2 >=kde-apps/palapeli-18.04.2 >=kde-apps/picmi-18.04.2 opengl? ( >=kde-apps/ksudoku-18.04.2 >=kde-apps/kubrick-18.04.2 ) python? ( >=kde-apps/kajongg-18.04.2 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3
new file mode 100644
index 000000000000..a5e72ba5d5bc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=6
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-18.04.3 >=kde-apps/bovo-18.04.3 >=kde-apps/granatier-18.04.3 >=kde-apps/kapman-18.04.3 >=kde-apps/katomic-18.04.3 >=kde-apps/kblackbox-18.04.3 >=kde-apps/kblocks-18.04.3 >=kde-apps/kbounce-18.04.3 >=kde-apps/kbreakout-18.04.3 >=kde-apps/kdiamond-18.04.3 >=kde-apps/kfourinline-18.04.3 >=kde-apps/kgoldrunner-18.04.3 >=kde-apps/kigo-18.04.3 >=kde-apps/killbots-18.04.3 >=kde-apps/kiriki-18.04.3 >=kde-apps/kjumpingcube-18.04.3 >=kde-apps/klickety-18.04.3 >=kde-apps/klines-18.04.3 >=kde-apps/kmahjongg-18.04.3 >=kde-apps/kmines-18.04.3 >=kde-apps/knavalbattle-18.04.3 >=kde-apps/knetwalk-18.04.3 >=kde-apps/kolf-18.04.3 >=kde-apps/kollision-18.04.3 >=kde-apps/konquest-18.04.3 >=kde-apps/kpat-18.04.3 >=kde-apps/kreversi-18.04.3 >=kde-apps/kshisen-18.04.3 >=kde-apps/ksirk-18.04.3 >=kde-apps/ksnakeduel-18.04.3 >=kde-apps/kspaceduel-18.04.3 >=kde-apps/ksquares-18.04.3 >=kde-apps/ktuberling-18.04.3 >=kde-apps/libkdegames-18.04.3 >=kde-apps/libkmahjongg-18.04.3 >=kde-apps/lskat-18.04.3 >=kde-apps/palapeli-18.04.3 >=kde-apps/picmi-18.04.3 opengl? ( >=kde-apps/ksudoku-18.04.3 >=kde-apps/kubrick-18.04.3 ) python? ( >=kde-apps/kajongg-18.04.3 ) !kde-apps/kdegames-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.2
deleted file mode 100644
index ef7c9d767060..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-18.04.2 >=kde-apps/kamera-18.04.2 >=kde-apps/kcolorchooser-18.04.2 >=kde-apps/kdegraphics-mobipocket-18.04.2 >=kde-apps/kolourpaint-18.04.2 >=kde-apps/kruler-18.04.2 >=kde-apps/libkdcraw-18.04.2 >=kde-apps/libkexiv2-18.04.2 >=kde-apps/libkipi-18.04.2 >=kde-apps/okular-18.04.2 >=kde-apps/spectacle-18.04.2 >=kde-apps/svgpart-18.04.2 >=kde-apps/thumbnailers-18.04.2 scanner? ( >=kde-apps/libksane-18.04.2 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3
new file mode 100644
index 000000000000..329db4f98cf0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/
+IUSE=scanner
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-18.04.3 >=kde-apps/kamera-18.04.3 >=kde-apps/kcolorchooser-18.04.3 >=kde-apps/kdegraphics-mobipocket-18.04.3 >=kde-apps/kolourpaint-18.04.3 >=kde-apps/kruler-18.04.3 >=kde-apps/libkdcraw-18.04.3 >=kde-apps/libkexiv2-18.04.3 >=kde-apps/libkipi-18.04.3 >=kde-apps/okular-18.04.3 >=kde-apps/spectacle-18.04.3 >=kde-apps/svgpart-18.04.3 >=kde-apps/thumbnailers-18.04.3 scanner? ( >=kde-apps/libksane-18.04.3 ) !kde-apps/kdegraphics-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.2
deleted file mode 100644
index 9cb9f7868df9..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.44.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdegraphics-mobipocket-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3
new file mode 100644
index 000000000000..6fbb4b0b011e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.46.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdegraphics-mobipocket-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.2
deleted file mode 100644
index 1846cf352ae1..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-18.04.2 >=kde-apps/juk-18.04.2 >=kde-apps/kdenlive-18.04.2 >=kde-apps/kmix-18.04.2 >=kde-apps/kwave-18.04.2 >=kde-apps/libkcddb-18.04.2 cdrom? ( >=kde-apps/audiocd-kio-18.04.2 >=kde-apps/k3b-18.04.2 >=kde-apps/libkcompactdisc-18.04.2 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.2 ) gstreamer? ( >=kde-apps/kamoso-18.04.2 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=19533069cf8a831929fa766cdc8d0381
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3
new file mode 100644
index 000000000000..6bd28846068e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-18.04.3 >=kde-apps/juk-18.04.3 >=kde-apps/kdenlive-18.04.3 >=kde-apps/kmix-18.04.3 >=kde-apps/kwave-18.04.3 >=kde-apps/libkcddb-18.04.3 cdrom? ( >=kde-apps/audiocd-kio-18.04.3 >=kde-apps/k3b-18.04.3 >=kde-apps/libkcompactdisc-18.04.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.04.3 ) gstreamer? ( >=kde-apps/kamoso-18.04.3 ) !kde-apps/kdemultimedia-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=19533069cf8a831929fa766cdc8d0381
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.2
deleted file mode 100644
index fc741f6a38ad..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kcontrol filesharing config module for SMB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdenetwork-filesharing-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3
new file mode 100644
index 000000000000..5fb854fb3fde
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kcontrol filesharing config module for SMB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdenetwork-filesharing-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.2
deleted file mode 100644
index a2fa5a5d8b7c..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+telepathy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.2 >=kde-apps/kget-18.04.2 >=kde-apps/krdc-18.04.2 >=kde-apps/kopete-18.04.2 >=kde-apps/krfb-18.04.2 >=kde-apps/zeroconf-ioslave-18.04.2 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.04.2 ) !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=65b9dc7995b65aef238a474de1947348
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3
new file mode 100644
index 000000000000..7f3e99ef223c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+telepathy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-18.04.3 >=kde-apps/kget-18.04.3 >=kde-apps/krdc-18.04.3 >=kde-apps/kopete-18.04.3 >=kde-apps/krfb-18.04.3 >=kde-apps/zeroconf-ioslave-18.04.3 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.04.3 ) !kde-apps/kdenetwork-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=65b9dc7995b65aef238a474de1947348
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.2 b/metadata/md5-cache/kde-apps/kdenlive-18.04.2
deleted file mode 100644
index 80f763e36e03..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.44.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=6
-HOMEPAGE=https://www.kdenlive.org/
-IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.44.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdenlive-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=331c0a95d4c773f960e4dac5bfea076b
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.04.3 b/metadata/md5-cache/kde-apps/kdenlive-18.04.3
new file mode 100644
index 000000000000..e15a2ae08f44
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=6
+HOMEPAGE=https://www.kdenlive.org/
+IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.6.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdenlive-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=331c0a95d4c773f960e4dac5bfea076b
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.2
deleted file mode 100644
index 6cd9be129302..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.2:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=importwizard test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.2:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdepim-addons-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3
new file mode 100644
index 000000000000..34be2d373ea9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/libktnef-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.3:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=importwizard test debug examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/libktnef-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.04.3:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdepim-addons-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.2
deleted file mode 100644
index 13016a401147..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/prison-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdepim-apps-libs-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3
new file mode 100644
index 000000000000..374db9ded28c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/prison-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdepim-apps-libs-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.2
deleted file mode 100644
index c9ff0d07a2e9..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-18.04.2 >=kde-apps/akonadiconsole-18.04.2 >=kde-apps/akonadi-calendar-18.04.2 >=kde-apps/akonadi-contacts-18.04.2 >=kde-apps/akonadi-import-wizard-18.04.2 >=kde-apps/akonadi-mime-18.04.2 >=kde-apps/akonadi-notes-18.04.2 >=kde-apps/akonadi-search-18.04.2 >=kde-apps/akregator-18.04.2 >=kde-apps/calendarjanitor-18.04.2 >=kde-apps/calendarsupport-18.04.2 >=kde-apps/eventviews-18.04.2 >=kde-apps/grantlee-editor-18.04.2 >=kde-apps/grantleetheme-18.04.2 >=kde-apps/incidenceeditor-18.04.2 >=kde-apps/kaddressbook-18.04.2 >=kde-apps/kalarm-18.04.2 >=kde-apps/kalarmcal-18.04.2 >=kde-apps/kcalcore-18.04.2 >=kde-apps/kcalutils-18.04.2 >=kde-apps/kcontacts-18.04.2 >=kde-apps/kdepim-addons-18.04.2 >=kde-apps/kdepim-apps-libs-18.04.2 >=kde-apps/kdepim-runtime-18.04.2 >=kde-apps/kidentitymanagement-18.04.2 >=kde-apps/kimap-18.04.2 >=kde-apps/kldap-18.04.2 >=kde-apps/kleopatra-18.04.2 >=kde-apps/kmail-18.04.2 >=kde-apps/kmail-account-wizard-18.04.2 >=kde-apps/kmailtransport-18.04.2 >=kde-apps/kmbox-18.04.2 >=kde-apps/kmime-18.04.2 >=kde-apps/knotes-18.04.2 >=kde-apps/konsolekalendar-18.04.2 >=kde-apps/kontact-18.04.2 >=kde-apps/kontactinterface-18.04.2 >=kde-apps/korganizer-18.04.2 >=kde-apps/kpimtextedit-18.04.2 >=kde-apps/ksmtp-18.04.2 >=kde-apps/libgravatar-18.04.2 >=kde-apps/libkdepim-18.04.2 >=kde-apps/libkgapi-18.04.2 >=kde-apps/libkleo-18.04.2 >=kde-apps/libksieve-18.04.2 >=kde-apps/libktnef-18.04.2 >=kde-apps/mailcommon-18.04.2 >=kde-apps/mailimporter-18.04.2 >=kde-apps/mbox-importer-18.04.2 >=kde-apps/messagelib-18.04.2 >=kde-apps/pim-data-exporter-18.04.2 >=kde-apps/pim-sieve-editor-18.04.2 >=kde-apps/pimcommon-18.04.2 >=kde-apps/syndication-18.04.2 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9ea783cb1933ae875cbc0c2d03777e26
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3
new file mode 100644
index 000000000000..f81911afc819
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.04.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/akonadi-18.04.3 >=kde-apps/akonadiconsole-18.04.3 >=kde-apps/akonadi-calendar-18.04.3 >=kde-apps/akonadi-contacts-18.04.3 >=kde-apps/akonadi-import-wizard-18.04.3 >=kde-apps/akonadi-mime-18.04.3 >=kde-apps/akonadi-notes-18.04.3 >=kde-apps/akonadi-search-18.04.3 >=kde-apps/akregator-18.04.3 >=kde-apps/calendarjanitor-18.04.3 >=kde-apps/calendarsupport-18.04.3 >=kde-apps/eventviews-18.04.3 >=kde-apps/grantlee-editor-18.04.3 >=kde-apps/grantleetheme-18.04.3 >=kde-apps/incidenceeditor-18.04.3 >=kde-apps/kaddressbook-18.04.3 >=kde-apps/kalarm-18.04.3 >=kde-apps/kalarmcal-18.04.3 >=kde-apps/kcalcore-18.04.3 >=kde-apps/kcalutils-18.04.3 >=kde-apps/kcontacts-18.04.3 >=kde-apps/kdepim-addons-18.04.3 >=kde-apps/kdepim-apps-libs-18.04.3 >=kde-apps/kdepim-runtime-18.04.3 >=kde-apps/kidentitymanagement-18.04.3 >=kde-apps/kimap-18.04.3 >=kde-apps/kldap-18.04.3 >=kde-apps/kleopatra-18.04.3 >=kde-apps/kmail-18.04.3 >=kde-apps/kmail-account-wizard-18.04.3 >=kde-apps/kmailtransport-18.04.3 >=kde-apps/kmbox-18.04.3 >=kde-apps/kmime-18.04.3 >=kde-apps/knotes-18.04.3 >=kde-apps/konsolekalendar-18.04.3 >=kde-apps/kontact-18.04.3 >=kde-apps/kontactinterface-18.04.3 >=kde-apps/korganizer-18.04.3 >=kde-apps/kpimtextedit-18.04.3 >=kde-apps/ksmtp-18.04.3 >=kde-apps/libgravatar-18.04.3 >=kde-apps/libkdepim-18.04.3 >=kde-apps/libkgapi-18.04.3 >=kde-apps/libkleo-18.04.3 >=kde-apps/libksieve-18.04.3 >=kde-apps/libktnef-18.04.3 >=kde-apps/mailcommon-18.04.3 >=kde-apps/mailimporter-18.04.3 >=kde-apps/mbox-importer-18.04.3 >=kde-apps/messagelib-18.04.3 >=kde-apps/pim-data-exporter-18.04.3 >=kde-apps/pim-sieve-editor-18.04.3 >=kde-apps/pimcommon-18.04.3 >=kde-apps/syndication-18.04.3 !kde-apps/kdepim-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9ea783cb1933ae875cbc0c2d03777e26
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.2
deleted file mode 100644
index ff8dc00b011b..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdav-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkgapi-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.04.2:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/kalarmcal-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdav-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkgapi-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdepim-runtime-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0ba1ec34207bfec38db44f3d5950500c
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3
new file mode 100644
index 000000000000..a77c854e76f4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/kalarmcal-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdav-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmbox-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkgapi-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.04.3:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/kalarmcal-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdav-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmbox-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkgapi-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.46.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdepim-runtime-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ba1ec34207bfec38db44f3d5950500c
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.2
deleted file mode 100644
index 51c5923a642a..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdesdk-kioslaves-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3
new file mode 100644
index 000000000000..b741c78a3038
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdesdk-kioslaves-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.2
deleted file mode 100644
index 44b2a342ab8c..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=cvs
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-plugins-18.04.2 >=kde-apps/kapptemplate-18.04.2 >=kde-apps/kcachegrind-18.04.2 >=kde-apps/kde-dev-scripts-18.04.2 >=kde-apps/kde-dev-utils-18.04.2 >=kde-apps/kdesdk-kioslaves-18.04.2 >=kde-apps/kdesdk-thumbnailers-18.04.2 >=kde-apps/kompare-18.04.2 >=kde-apps/kross-interpreters-18.04.2 >=kde-apps/libkomparediff2-18.04.2 >=kde-apps/lokalize-18.04.2 >=kde-apps/poxml-18.04.2 >=kde-apps/umbrello-18.04.2 cvs? ( >=kde-apps/cervisia-18.04.2 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3
new file mode 100644
index 000000000000..fb4419e06b2c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+IUSE=cvs
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-plugins-18.04.3 >=kde-apps/kapptemplate-18.04.3 >=kde-apps/kcachegrind-18.04.3 >=kde-apps/kde-dev-scripts-18.04.3 >=kde-apps/kde-dev-utils-18.04.3 >=kde-apps/kdesdk-kioslaves-18.04.3 >=kde-apps/kdesdk-thumbnailers-18.04.3 >=kde-apps/kompare-18.04.3 >=kde-apps/kross-interpreters-18.04.3 >=kde-apps/libkomparediff2-18.04.3 >=kde-apps/lokalize-18.04.3 >=kde-apps/poxml-18.04.3 >=kde-apps/umbrello-18.04.3 cvs? ( >=kde-apps/cervisia-18.04.3 ) !kde-apps/kdesdk-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ecdbdfbfef966e8bf2000c3e1d12667e
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.2
deleted file mode 100644
index 38a37a970936..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdesdk-thumbnailers-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3
new file mode 100644
index 000000000000..b8b8d6e4b5f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdesdk-thumbnailers-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.2
deleted file mode 100644
index 4b65af146d1e..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
-IUSE=cups floppy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-18.04.2 >=kde-apps/filelight-18.04.2 >=kde-apps/kbackup-18.04.2 >=kde-apps/kcalc-18.04.2 >=kde-apps/kcharselect-18.04.2 >=kde-apps/kdebugsettings-18.04.2 >=kde-apps/kdf-18.04.2 >=kde-apps/kgpg-18.04.2 >=kde-apps/kimagemapeditor-18.04.2 >=kde-apps/kteatime-18.04.2 >=kde-apps/ktimer-18.04.2 >=kde-apps/kwalletmanager-18.04.2 >=kde-apps/sweeper-18.04.2 cups? ( >=kde-apps/print-manager-18.04.2 ) floppy? ( >=kde-apps/kfloppy-18.04.2 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3
new file mode 100644
index 000000000000..e78abc33153e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
+IUSE=cups floppy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ark-18.04.3 >=kde-apps/filelight-18.04.3 >=kde-apps/kbackup-18.04.3 >=kde-apps/kcalc-18.04.3 >=kde-apps/kcharselect-18.04.3 >=kde-apps/kdebugsettings-18.04.3 >=kde-apps/kdf-18.04.3 >=kde-apps/kgpg-18.04.3 >=kde-apps/kimagemapeditor-18.04.3 >=kde-apps/kteatime-18.04.3 >=kde-apps/ktimer-18.04.3 >=kde-apps/kwalletmanager-18.04.3 >=kde-apps/sweeper-18.04.3 cups? ( >=kde-apps/print-manager-18.04.3 ) floppy? ( >=kde-apps/kfloppy-18.04.3 ) !kde-apps/kdeutils-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=43fac0da81f9d8d20e482aa8d349d94c
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.2 b/metadata/md5-cache/kde-apps/kdf-18.04.2
deleted file mode 100644
index 3184343a1dd9..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE free disk space utility
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/kdf
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdf-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.04.3 b/metadata/md5-cache/kde-apps/kdf-18.04.3
new file mode 100644
index 000000000000..8935413fb111
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE free disk space utility
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/kdf
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdf-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.2 b/metadata/md5-cache/kde-apps/kdialog-18.04.2
deleted file mode 100644
index 880c7ff5b96f..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdialog-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.04.3 b/metadata/md5-cache/kde-apps/kdialog-18.04.3
new file mode 100644
index 000000000000..5a3707ae4c51
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdialog-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.2 b/metadata/md5-cache/kde-apps/kdiamond-18.04.2
deleted file mode 100644
index 283ae9d4b6d2..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE three-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdiamond-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.04.3 b/metadata/md5-cache/kde-apps/kdiamond-18.04.3
new file mode 100644
index 000000000000..3d4649d0efe5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE three-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdiamond-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.2 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.2
deleted file mode 100644
index 3a1688b81655..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/keditbookmarks-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3
new file mode 100644
index 000000000000..0c1e63f8fc75
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/keditbookmarks-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.2 b/metadata/md5-cache/kde-apps/kfind-18.04.2
deleted file mode 100644
index 476684f6790f..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kfind-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfind-18.04.3 b/metadata/md5-cache/kde-apps/kfind-18.04.3
new file mode 100644
index 000000000000..74a288e077d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kfind-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdf5b5647d714aae0431751f0704625d
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.2 b/metadata/md5-cache/kde-apps/kfloppy-18.04.2
deleted file mode 100644
index a7ec3dee1a77..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kfloppy-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.04.3 b/metadata/md5-cache/kde-apps/kfloppy-18.04.3
new file mode 100644
index 000000000000..f364ecd635bd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kfloppy-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.2 b/metadata/md5-cache/kde-apps/kfourinline-18.04.2
deleted file mode 100644
index 7d37eb8cd9f3..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE four-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kfourinline-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.04.3 b/metadata/md5-cache/kde-apps/kfourinline-18.04.3
new file mode 100644
index 000000000000..ffe00fd5acc5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE four-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kfourinline-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.2 b/metadata/md5-cache/kde-apps/kgeography-18.04.2
deleted file mode 100644
index 83808a1206cc..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Geography learning tool
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kgeography-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.04.3 b/metadata/md5-cache/kde-apps/kgeography-18.04.3
new file mode 100644
index 000000000000..842e4a7e8c72
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Geography learning tool
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kgeography-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.2 b/metadata/md5-cache/kde-apps/kget-18.04.2
deleted file mode 100644
index 459244ca9df7..000000000000
--- a/metadata/md5-cache/kde-apps/kget-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kget-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kget-18.04.3 b/metadata/md5-cache/kde-apps/kget-18.04.3
new file mode 100644
index 000000000000..24b547585692
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced download manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kget/
+IUSE=bittorrent gpg kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kget-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7392a0cf28ee9e04f8dbaead57cb8ebe
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.2 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.2
deleted file mode 100644
index 01b77bdda29b..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kgoldrunner-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3
new file mode 100644
index 000000000000..3340b052c2ba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kgoldrunner-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.2 b/metadata/md5-cache/kde-apps/kgpg-18.04.2
deleted file mode 100644
index 24edb89d5aed..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kgpg-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.04.3 b/metadata/md5-cache/kde-apps/kgpg-18.04.3
new file mode 100644
index 000000000000..9b4fae3ea7c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kgpg-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.2 b/metadata/md5-cache/kde-apps/khangman-18.04.2
deleted file mode 100644
index 7e414a76c1b8..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical hangman game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.04.2:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/khangman-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khangman-18.04.3 b/metadata/md5-cache/kde-apps/khangman-18.04.3
new file mode 100644
index 000000000000..22d7c3cbbc32
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical hangman game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.04.3:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/khangman-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.2 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.2
deleted file mode 100644
index 676deb2879cb..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The KDE Help Center
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdoctools-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/khelpcenter-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-18.04.3
new file mode 100644
index 000000000000..5cd6ee4dfc55
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdoctools-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The KDE Help Center
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdoctools-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/khelpcenter-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.2
deleted file mode 100644
index 9d17a31ca0bb..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kidentitymanagement-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3
new file mode 100644
index 000000000000..2d732d783076
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/kpimtextedit-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for managing identitites
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/kpimtextedit-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kidentitymanagement-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.2 b/metadata/md5-cache/kde-apps/kig-18.04.2
deleted file mode 100644
index 162d35ec1747..000000000000
--- a/metadata/md5-cache/kde-apps/kig-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
-IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kig-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kig-18.04.3 b/metadata/md5-cache/kde-apps/kig-18.04.3
new file mode 100644
index 000000000000..d4191af125cf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
+IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.4:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kig-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.2 b/metadata/md5-cache/kde-apps/kigo-18.04.2
deleted file mode 100644
index ca35fbcc44b4..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Go game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kigo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kigo-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/kigo-18.04.3 b/metadata/md5-cache/kde-apps/kigo-18.04.3
new file mode 100644
index 000000000000..4a7923252421
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Go game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kigo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kigo-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.2 b/metadata/md5-cache/kde-apps/killbots-18.04.2
deleted file mode 100644
index 30af33ba8c62..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/killbots/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/killbots-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/killbots-18.04.3 b/metadata/md5-cache/kde-apps/killbots-18.04.3
new file mode 100644
index 000000000000..29f578ce3778
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/killbots/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/killbots-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.2
deleted file mode 100644
index 185f909b0c76..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Generator of HTML image maps
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kimagemapeditor-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3
new file mode 100644
index 000000000000..023566447364
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Generator of HTML image maps
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kimagemapeditor-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.2 b/metadata/md5-cache/kde-apps/kimap-18.04.2
deleted file mode 100644
index 5da165926d22..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kimap-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kimap-18.04.3 b/metadata/md5-cache/kde-apps/kimap-18.04.3
new file mode 100644
index 000000000000..d271fcc603ba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kimap-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.2 b/metadata/md5-cache/kde-apps/kio-extras-18.04.2
deleted file mode 100644
index a12c20015dae..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kio-extras-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=15a6a04d537ae88f28f205bf262c0dfe
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.2-r1 b/metadata/md5-cache/kde-apps/kio-extras-18.04.2-r1
deleted file mode 100644
index 762ebbb311b6..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-18.04.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.44.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.44.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.44.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kio-extras-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=049eecc33b4e9f94216396bd94401195
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.04.3 b/metadata/md5-cache/kde-apps/kio-extras-18.04.3
new file mode 100644
index 000000000000..064b5da76360
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.46.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.46.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 activities? ( >=kde-frameworks/kactivities-5.46.0:5 >=dev-qt/qtsql-5.9.4:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) man? ( >=kde-frameworks/khtml-5.46.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kio-extras-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=15a6a04d537ae88f28f205bf262c0dfe
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.2 b/metadata/md5-cache/kde-apps/kiriki-18.04.2
deleted file mode 100644
index 8a819c090aa3..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An addictive and fun dice game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kiriki-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.04.3 b/metadata/md5-cache/kde-apps/kiriki-18.04.3
new file mode 100644
index 000000000000..4efc12972885
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An addictive and fun dice game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kiriki-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.2 b/metadata/md5-cache/kde-apps/kiten-18.04.2
deleted file mode 100644
index f48995a95170..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kiten-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kiten-18.04.3 b/metadata/md5-cache/kde-apps/kiten-18.04.3
new file mode 100644
index 000000000000..70fe2168e832
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kiten-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.2 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.2
deleted file mode 100644
index 921a6c517898..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tactical one or two player game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kjumpingcube-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3 b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3
new file mode 100644
index 000000000000..a6fabe34a3cb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tactical one or two player game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kjumpingcube-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.2 b/metadata/md5-cache/kde-apps/kldap-18.04.2
deleted file mode 100644
index f8dc51e497d0..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kldap-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kldap-18.04.3 b/metadata/md5-cache/kde-apps/kldap-18.04.3
new file mode 100644
index 000000000000..4cd6dc7d1549
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kldap-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.2 b/metadata/md5-cache/kde-apps/kleopatra-18.04.2
deleted file mode 100644
index 35c9e212f903..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kleopatra-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.04.3 b/metadata/md5-cache/kde-apps/kleopatra-18.04.3
new file mode 100644
index 000000000000..ac7392f19a65
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kleopatra-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.2 b/metadata/md5-cache/kde-apps/klettres-18.04.2
deleted file mode 100644
index 970f9a2a41a7..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Alphabet learning application
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/klettres-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klettres-18.04.3 b/metadata/md5-cache/kde-apps/klettres-18.04.3
new file mode 100644
index 000000000000..73ba4ce36944
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Alphabet learning application
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/klettres-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.2 b/metadata/md5-cache/kde-apps/klickety-18.04.2
deleted file mode 100644
index 1ea7895c891b..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/klickety-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klickety-18.04.3 b/metadata/md5-cache/kde-apps/klickety-18.04.3
new file mode 100644
index 000000000000..a8758f8c7a0b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/klickety-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.2 b/metadata/md5-cache/kde-apps/klines-18.04.2
deleted file mode 100644
index b2d2eeb18bc7..000000000000
--- a/metadata/md5-cache/kde-apps/klines-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/klines-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/klines-18.04.3 b/metadata/md5-cache/kde-apps/klines-18.04.3
new file mode 100644
index 000000000000..da2621c92ac4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/klines-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.2 b/metadata/md5-cache/kde-apps/kmag-18.04.2
deleted file mode 100644
index 84bafee0c0d2..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE screen magnifier
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmag-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmag-18.04.3 b/metadata/md5-cache/kde-apps/kmag-18.04.3
new file mode 100644
index 000000000000..346e131b262a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE screen magnifier
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmag-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.2 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.2
deleted file mode 100644
index eaa38704000b..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A tile matching game for one or two players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmahjongg-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-18.04.3
new file mode 100644
index 000000000000..2e8116c111f3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=kde-apps/libkmahjongg-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A tile matching game for one or two players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=kde-apps/libkmahjongg-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmahjongg-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.2 b/metadata/md5-cache/kde-apps/kmail-18.04.2
deleted file mode 100644
index 04400ef6eccd..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kldap-18.04.2:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.2:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/libktnef-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-apps/kmail-account-wizard-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmail-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-18.04.3 b/metadata/md5-cache/kde-apps/kmail-18.04.3
new file mode 100644
index 000000000000..6efbea9f7a90
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/libktnef-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kldap-18.04.3:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.04.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kmail/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/libktnef-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-apps/kmail-account-wizard-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmail-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09eb9f1e5bc1c02edc857e32049a277a
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.2
deleted file mode 100644
index c426558752f3..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmail-account-wizard-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3
new file mode 100644
index 000000000000..0b8b3a99e40a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmail-account-wizard-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.2 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.2
deleted file mode 100644
index 727bd6a41d88..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/ksmtp-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/ksmtp-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmailtransport-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb8a598ce1385111ccedfdd54a58ffbd
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-18.04.3
new file mode 100644
index 000000000000..88575aeb3e77
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/ksmtp-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 test? ( >=kde-frameworks/ktextwidgets-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mail transport service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/ksmtp-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmailtransport-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bb8a598ce1385111ccedfdd54a58ffbd
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.2 b/metadata/md5-cache/kde-apps/kmbox-18.04.2
deleted file mode 100644
index bca233f63e24..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmbox-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.04.3 b/metadata/md5-cache/kde-apps/kmbox-18.04.3
new file mode 100644
index 000000000000..8f422ac6792d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-18.04.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmbox-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.2 b/metadata/md5-cache/kde-apps/kmime-18.04.2
deleted file mode 100644
index 4e677c9b24b5..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmime-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmime-18.04.3 b/metadata/md5-cache/kde-apps/kmime-18.04.3
new file mode 100644
index 000000000000..dd5a5ee2cac6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmime-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.2 b/metadata/md5-cache/kde-apps/kmines-18.04.2
deleted file mode 100644
index 957c611f197d..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classic mine sweeper game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmines-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmines-18.04.3 b/metadata/md5-cache/kde-apps/kmines-18.04.3
new file mode 100644
index 000000000000..4526d984c958
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classic mine sweeper game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmines-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.2 b/metadata/md5-cache/kde-apps/kmix-18.04.2
deleted file mode 100644
index aebddc0e892a..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma mixer gui
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
-IUSE=alsa pulseaudio debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmix-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmix-18.04.3 b/metadata/md5-cache/kde-apps/kmix-18.04.3
new file mode 100644
index 000000000000..bfee34b07f8a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma mixer gui
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
+IUSE=alsa pulseaudio debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.12.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmix-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.2 b/metadata/md5-cache/kde-apps/kmousetool-18.04.2
deleted file mode 100644
index 9e0c9a3820f8..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmousetool-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fa056f331b3d4cfc01afb0ad49ad9bc
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.04.3 b/metadata/md5-cache/kde-apps/kmousetool-18.04.3
new file mode 100644
index 000000000000..e61745c69032
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmousetool-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3fa056f331b3d4cfc01afb0ad49ad9bc
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.2 b/metadata/md5-cache/kde-apps/kmouth-18.04.2
deleted file mode 100644
index 81bc931ff413..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmouth-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.04.3 b/metadata/md5-cache/kde-apps/kmouth-18.04.3
new file mode 100644
index 000000000000..b8622da742f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmouth-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.2 b/metadata/md5-cache/kde-apps/kmplot-18.04.2
deleted file mode 100644
index d21c5c8f2c5d..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mathematical function plotter
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kmplot-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.04.3 b/metadata/md5-cache/kde-apps/kmplot-18.04.3
new file mode 100644
index 000000000000..337d5e105c70
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mathematical function plotter
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kmplot-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.2 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.2
deleted file mode 100644
index c93302a8a546..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Battleship clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/knavalbattle-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-18.04.3
new file mode 100644
index 000000000000..d73d3e858666
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Battleship clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/knavalbattle-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.2 b/metadata/md5-cache/kde-apps/knetwalk-18.04.2
deleted file mode 100644
index 41be7160ddb2..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/knetwalk-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.04.3 b/metadata/md5-cache/kde-apps/knetwalk-18.04.3
new file mode 100644
index 000000000000..29e20d1aabd4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/knetwalk-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.2 b/metadata/md5-cache/kde-apps/knotes-18.04.2
deleted file mode 100644
index 63763c256ed9..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/knotes-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/knotes-18.04.3 b/metadata/md5-cache/kde-apps/knotes-18.04.3
new file mode 100644
index 000000000000..0422a11f24db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Note taking application
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/knotes-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.2 b/metadata/md5-cache/kde-apps/kolf-18.04.2
deleted file mode 100644
index e85f7cd59b69..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Minigolf game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kolf-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kolf-18.04.3 b/metadata/md5-cache/kde-apps/kolf-18.04.3
new file mode 100644
index 000000000000..00b4d5753313
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Minigolf game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kolf-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.2 b/metadata/md5-cache/kde-apps/kollision-18.04.2
deleted file mode 100644
index 637190359d32..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple ball dodging game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kollision-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kollision-18.04.3 b/metadata/md5-cache/kde-apps/kollision-18.04.3
new file mode 100644
index 000000000000..ae69034aeeee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple ball dodging game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kollision-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.2 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.2
deleted file mode 100644
index 1cfbffed24ee..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.2:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Paint Program by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kolourpaint-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-18.04.3
new file mode 100644
index 000000000000..4c79b5c58490
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.3:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Paint Program by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kolourpaint-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.2 b/metadata/md5-cache/kde-apps/kompare-18.04.2
deleted file mode 100644
index 4fd4d71df5da..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A program to view the differences between files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkomparediff2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kompare-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/kompare-18.04.3 b/metadata/md5-cache/kde-apps/kompare-18.04.3
new file mode 100644
index 000000000000..2d89e3e2dc5a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkomparediff2-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A program to view the differences between files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkomparediff2-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kompare-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.2 b/metadata/md5-cache/kde-apps/konqueror-18.04.2
deleted file mode 100644
index 71160a24fc25..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) activities? ( >=kde-frameworks/kactivities-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy +webengine X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kdesu-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.2:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/konqueror-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be9e90af9cff929ca88471f10b10f5d4
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.04.3 b/metadata/md5-cache/kde-apps/konqueror-18.04.3
new file mode 100644
index 000000000000..a074b9304a54
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) activities? ( >=kde-frameworks/kactivities-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
+IUSE=activities speech tidy +webengine X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tidy? ( app-text/htmltidy ) webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.9.4:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.04.3:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be9e90af9cff929ca88471f10b10f5d4
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.2 b/metadata/md5-cache/kde-apps/konquest-18.04.2
deleted file mode 100644
index 297a30f553d7..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/konquest-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konquest-18.04.3 b/metadata/md5-cache/kde-apps/konquest-18.04.3
new file mode 100644
index 000000000000..437ed8f97b26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/konquest-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.2 b/metadata/md5-cache/kde-apps/konsole-18.04.2
deleted file mode 100644
index 736b7db6f7da..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE's terminal emulator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kinit-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/konsole-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsole-18.04.3 b/metadata/md5-cache/kde-apps/konsole-18.04.3
new file mode 100644
index 000000000000..efe939e8391f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE's terminal emulator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/konsole-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0540bff7faa536bab397e34be690a6c8
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.2 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.2
deleted file mode 100644
index d9acc21d3951..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/akonadi-calendar-tools-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3
new file mode 100644
index 000000000000..cc08b90e0c6c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.2 b/metadata/md5-cache/kde-apps/kontact-18.04.2
deleted file mode 100644
index f3a4df9e0753..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kontact-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontact-18.04.3 b/metadata/md5-cache/kde-apps/kontact-18.04.3
new file mode 100644
index 000000000000..2008905c634e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kontact-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.2 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.2
deleted file mode 100644
index c58a402e633e..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kontactinterface-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-18.04.3
new file mode 100644
index 000000000000..3f32ce4038f2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kontactinterface-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.2-r1 b/metadata/md5-cache/kde-apps/kopete-18.04.2-r1
deleted file mode 100644
index 481aaca5cc97..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-18.04.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kopete-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe8b89389ee165b37b3d50eddbd95afb
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.3 b/metadata/md5-cache/kde-apps/kopete-18.04.3
new file mode 100644
index 000000000000..0da3c336c4f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.46.0:5 >=kde-apps/kidentitymanagement-18.04.3:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
+IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.46.0:5 >=kde-apps/kidentitymanagement-18.04.3:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kopete-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=82b10e4ad0e461d822631fbcfe8d02d6
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.2 b/metadata/md5-cache/kde-apps/korganizer-18.04.2
deleted file mode 100644
index ccc48e198cf9..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-apps/kldap-18.04.2:5 >=dev-qt/designer-5.9.4:5 test? ( >=kde-apps/akonadi-18.04.2:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kholidays-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-calendar-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/akonadi-notes-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/eventviews-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kontactinterface-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/korganizer-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c0e2f48281a64199eb64abf54897f10
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.04.3 b/metadata/md5-cache/kde-apps/korganizer-18.04.3
new file mode 100644
index 000000000000..db10c0c2f9c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) >=kde-apps/kldap-18.04.3:5 >=dev-qt/designer-5.9.4:5 test? ( >=kde-apps/akonadi-18.04.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/korganizer/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kholidays-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-calendar-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/akonadi-notes-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/eventviews-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kontactinterface-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/korganizer-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c0e2f48281a64199eb64abf54897f10
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.2 b/metadata/md5-cache/kde-apps/kpat-18.04.2
deleted file mode 100644
index 7c7ec32aac33..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE patience game
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kpat-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.3 b/metadata/md5-cache/kde-apps/kpat-18.04.3
new file mode 100644
index 000000000000..b725d12cbfca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE patience game
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kpat-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.2 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.2
deleted file mode 100644
index 0608412f4fbb..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) test? ( >=kde-frameworks/ktextwidgets-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kpimtextedit-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3 b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3
new file mode 100644
index 000000000000..3585f8a4dfbe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) test? ( >=kde-frameworks/ktextwidgets-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A textedit with PIM-specific features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kpimtextedit-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.2
deleted file mode 100644
index 72c094524484..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kqtquickcharts-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3
new file mode 100644
index 000000000000..1575ac4f2e34
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kqtquickcharts-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.2 b/metadata/md5-cache/kde-apps/krdc-18.04.2
deleted file mode 100644
index 6b737156ed0e..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/krdc/
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/krdc-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/krdc-18.04.3 b/metadata/md5-cache/kde-apps/krdc-18.04.3
new file mode 100644
index 000000000000..64e963fae9ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/krdc/
+IUSE=+rdp vnc debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/krdc-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.2 b/metadata/md5-cache/kde-apps/kreversi-18.04.2
deleted file mode 100644
index f441fb91b03e..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Board game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kreversi-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.04.3 b/metadata/md5-cache/kde-apps/kreversi-18.04.3
new file mode 100644
index 000000000000..65a614c53a89
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Board game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kreversi-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.2 b/metadata/md5-cache/kde-apps/krfb-18.04.2
deleted file mode 100644
index bd18a8a7711e..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/krfb/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/krfb-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/krfb-18.04.3 b/metadata/md5-cache/kde-apps/krfb-18.04.3
new file mode 100644
index 000000000000..cb3f4f925ed6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/krfb/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/krfb-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.2 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.2
deleted file mode 100644
index 56ca1563c86a..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kross-interpreters-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=badf17c8bb40cd4709c3dd10a2346903
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3
new file mode 100644
index 000000000000..2aa1e320d7a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+python ruby debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kross-interpreters-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=badf17c8bb40cd4709c3dd10a2346903
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.2 b/metadata/md5-cache/kde-apps/kruler-18.04.2
deleted file mode 100644
index f4e7000fd082..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen ruler for Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kruler-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kruler-18.04.3 b/metadata/md5-cache/kde-apps/kruler-18.04.3
new file mode 100644
index 000000000000..bd201c5f9bb1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen ruler for Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kruler-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.2 b/metadata/md5-cache/kde-apps/kshisen-18.04.2
deleted file mode 100644
index 8779258b9daf..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE game similiar to Mahjongg
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=kde-apps/libkmahjongg-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kshisen-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.04.3 b/metadata/md5-cache/kde-apps/kshisen-18.04.3
new file mode 100644
index 000000000000..266ed6d1c32b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=kde-apps/libkmahjongg-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE game similiar to Mahjongg
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=kde-apps/libkmahjongg-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kshisen-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.2 b/metadata/md5-cache/kde-apps/ksirk-18.04.2
deleted file mode 100644
index 4a0fc3f674b0..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Port of the board game risk
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksirk-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.04.3 b/metadata/md5-cache/kde-apps/ksirk-18.04.3
new file mode 100644
index 000000000000..af3f3b106c3d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Port of the board game risk
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksirk-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60a888a869dd513e1502869a2d5d0786
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.2 b/metadata/md5-cache/kde-apps/ksmtp-18.04.2
deleted file mode 100644
index a5a2992951b7..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/kmime-18.04.2:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksmtp-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.04.3 b/metadata/md5-cache/kde-apps/ksmtp-18.04.3
new file mode 100644
index 000000000000..9c4cdb1f9651
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/kmime-18.04.3:5 >=dev-qt/qtnetwork-5.9.4:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksmtp-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.2 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.2
deleted file mode 100644
index 41c97fe465d3..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Tron game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksnakeduel-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3
new file mode 100644
index 000000000000..81c04b45ca23
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Tron game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksnakeduel-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.2 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.2
deleted file mode 100644
index c28887bc6fa9..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Space Game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kspaceduel-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-18.04.3
new file mode 100644
index 000000000000..478059fea061
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Space Game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kspaceduel-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.2 b/metadata/md5-cache/kde-apps/ksquares-18.04.2
deleted file mode 100644
index c4b081bc9e52..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE clone of the game squares
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksquares-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.04.3 b/metadata/md5-cache/kde-apps/ksquares-18.04.3
new file mode 100644
index 000000000000..21b9cb08b645
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE clone of the game squares
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksquares-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.2 b/metadata/md5-cache/kde-apps/ksudoku-18.04.2
deleted file mode 100644
index dcbff7a1b66f..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksudoku-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.04.3 b/metadata/md5-cache/kde-apps/ksudoku-18.04.3
new file mode 100644
index 000000000000..07fcec592bfc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksudoku-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.2 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.2
deleted file mode 100644
index c48d6768fbc1..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System log viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
-IUSE=systemd test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ksystemlog-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.04.3 b/metadata/md5-cache/kde-apps/ksystemlog-18.04.3
new file mode 100644
index 000000000000..baadb3b68a0a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System log viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
+IUSE=systemd test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ksystemlog-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.2 b/metadata/md5-cache/kde-apps/kteatime-18.04.2
deleted file mode 100644
index 6e7f6176f71c..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kteatime-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.04.3 b/metadata/md5-cache/kde-apps/kteatime-18.04.3
new file mode 100644
index 000000000000..58c6409d1e53
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kteatime-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.2 b/metadata/md5-cache/kde-apps/ktimer-18.04.2
deleted file mode 100644
index 0617be591b9d..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Timer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktimer-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.04.3 b/metadata/md5-cache/kde-apps/ktimer-18.04.3
new file mode 100644
index 000000000000..56c2a5fc3e0a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Timer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktimer-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.2 b/metadata/md5-cache/kde-apps/ktouch-18.04.2
deleted file mode 100644
index 13bd9ef93b00..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/ktouch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktouch-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.04.3 b/metadata/md5-cache/kde-apps/ktouch-18.04.3
new file mode 100644
index 000000000000..604602139089
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/ktouch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktouch-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.2
deleted file mode 100644
index 70a437bd014b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 dev-util/intltool net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=experimental debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.2:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-accounts-kcm-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3422cd549ae8e2b24860e5f4cc7b1f2
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3
new file mode 100644
index 000000000000..0b30a2dcf07f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 dev-util/intltool net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=experimental debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.04.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-accounts-kcm-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3422cd549ae8e2b24860e5f4cc7b1f2
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.2 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.2
deleted file mode 100644
index 18de5c380646..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-approver-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-18.04.3
new file mode 100644
index 000000000000..ba2ca8e72625
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-approver-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.2
deleted file mode 100644
index edbf961531a4..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/kaccounts-integration-18.04.2:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-auth-handler-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3
new file mode 100644
index 000000000000..e869b3d9dcd1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/kaccounts-integration-18.04.3:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-auth-handler-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3ff45856fe8e0cdf15f0959283ba2da0
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.2
deleted file mode 100644
index 59be1338359b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy audio/video conferencing ui
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-call-ui-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3
new file mode 100644
index 000000000000..914f888fd191
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy audio/video conferencing ui
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-call-ui-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.2
deleted file mode 100644
index fcd707d55d3b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy common library
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-common-internals-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3
new file mode 100644
index 000000000000..d337e511ccf3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtnetwork-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy common library
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-18.04.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-common-internals-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.2
deleted file mode 100644
index d14c5036dd4c..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact list
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-contact-list-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3
new file mode 100644
index 000000000000..6db110aaefbe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact list
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-contact-list-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.2
deleted file mode 100644
index 098c366afd5b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-contact-runner-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3
new file mode 100644
index 000000000000..7317f8952a8c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-contact-runner-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.2
deleted file mode 100644
index 9bc348b5e845..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/ki18n-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-desktop-applets-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3
new file mode 100644
index 000000000000..be7cb9720b32
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/ki18n-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-desktop-applets-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.2
deleted file mode 100644
index 55372f684cd6..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-filetransfer-handler-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3
new file mode 100644
index 000000000000..0ae01c8d191b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-filetransfer-handler-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.2
deleted file mode 100644
index 223dc74b9e88..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kidletime-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-kded-module-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3
new file mode 100644
index 000000000000..888e0fbaffc4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-kded-module-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.2 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.2
deleted file mode 100644
index fd7a9ba58759..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.2:5 >=kde-apps/ktp-filetransfer-handler-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-send-file-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3
new file mode 100644
index 000000000000..84d9050fc82a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.04.3:5 >=kde-apps/ktp-filetransfer-handler-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-send-file-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.2
deleted file mode 100644
index 73d4cea26e7f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=speech debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdewebkit-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kpeople-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-apps/ktp-common-internals-18.04.2:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktp-text-ui-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3
new file mode 100644
index 000000000000..3f82c54962cc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=speech debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdewebkit-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-apps/ktp-common-internals-18.04.3:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktp-text-ui-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.2 b/metadata/md5-cache/kde-apps/ktuberling-18.04.2
deleted file mode 100644
index 077ab32a6cfb..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Potato game for kids by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktuberling-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.04.3 b/metadata/md5-cache/kde-apps/ktuberling-18.04.3
new file mode 100644
index 000000000000..4b3a5e87ddb0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Potato game for kids by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktuberling-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.2 b/metadata/md5-cache/kde-apps/kturtle-18.04.2
deleted file mode 100644
index 962478697a85..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kturtle-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.04.3 b/metadata/md5-cache/kde-apps/kturtle-18.04.3
new file mode 100644
index 000000000000..d7d749bde9a4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kturtle-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.2 b/metadata/md5-cache/kde-apps/kubrick-18.04.2
deleted file mode 100644
index eab9419c1b0f..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kubrick/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kubrick-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.04.3 b/metadata/md5-cache/kde-apps/kubrick-18.04.3
new file mode 100644
index 000000000000..2f3175647084
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kubrick/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kubrick-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.2 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.2
deleted file mode 100644
index a092bde107b1..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Wallet management tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kauth-5.44.0:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kwalletmanager-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3
new file mode 100644
index 000000000000..40e17460a48e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Wallet management tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kwalletmanager-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.2 b/metadata/md5-cache/kde-apps/kwave-18.04.2
deleted file mode 100644
index d83cf76dddda..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.04.2:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=6
-HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kwave-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwave-18.04.3 b/metadata/md5-cache/kde-apps/kwave-18.04.3
new file mode 100644
index 000000000000..a70efdb4d681
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.04.3:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=6
+HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.4:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kwave-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.2 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.2
deleted file mode 100644
index b021c1c59c9c..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A powerful flashcard and vocabulary learning program
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkeduvocdocument-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kwordquiz-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-18.04.3
new file mode 100644
index 000000000000..d4327496b517
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A powerful flashcard and vocabulary learning program
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkeduvocdocument-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kwordquiz-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.2 b/metadata/md5-cache/kde-apps/kwrite-18.04.2
deleted file mode 100644
index 89a1ab6dc410..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE simple text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kate-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.04.3 b/metadata/md5-cache/kde-apps/kwrite-18.04.3
new file mode 100644
index 000000000000..f31db23a2af3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE simple text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kate-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=53f047b68179d392996158ff43b903e5
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.2 b/metadata/md5-cache/kde-apps/libgravatar-18.04.2
deleted file mode 100644
index 0c1b7315ddd9..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libgravatar-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.04.3 b/metadata/md5-cache/kde-apps/libgravatar-18.04.3
new file mode 100644
index 000000000000..70644184b3fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for gravatar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libgravatar-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.2 b/metadata/md5-cache/kde-apps/libkcddb-18.04.2
deleted file mode 100644
index 20f9d39310ed..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for CDDB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkcddb-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.04.3 b/metadata/md5-cache/kde-apps/libkcddb-18.04.3
new file mode 100644
index 000000000000..bc417b680636
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for CDDB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkcddb-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.2
deleted file mode 100644
index 56559b936567..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=alsa debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/solid-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkcompactdisc-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3
new file mode 100644
index 000000000000..1363fb8644e1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=alsa debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkcompactdisc-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.2-r1 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.2-r1
deleted file mode 100644
index d02725acee98..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.04.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 <media-libs/libraw-0.19:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 <media-libs/libraw-0.19:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkdcraw-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edb98dc06df214de7437ced1dbc4f33d
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-18.04.3
new file mode 100644
index 000000000000..f9a3cc666858
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 <media-libs/libraw-0.19:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 <media-libs/libraw-0.19:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkdcraw-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=edb98dc06df214de7437ced1dbc4f33d
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.2 b/metadata/md5-cache/kde-apps/libkdegames-18.04.2
deleted file mode 100644
index 90c2b9086585..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Base library common to many KDE games
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/kglobalaccel-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkdegames-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.04.3 b/metadata/md5-cache/kde-apps/libkdegames-18.04.3
new file mode 100644
index 000000000000..196717c2840c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Base library common to many KDE games
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkdegames-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.2 b/metadata/md5-cache/kde-apps/libkdepim-18.04.2
deleted file mode 100644
index e67428439060..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-search-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkdepim-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.04.3 b/metadata/md5-cache/kde-apps/libkdepim-18.04.3
new file mode 100644
index 000000000000..4bc33f9b2ffe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-search-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkdepim-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.2
deleted file mode 100644
index d9ec67f87853..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkeduvocdocument-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3
new file mode 100644
index 000000000000..3a5e602b3184
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkeduvocdocument-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.2 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.2
deleted file mode 100644
index 081a28808f5b..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkexiv2-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-18.04.3
new file mode 100644
index 000000000000..c37490e2c019
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkexiv2-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.2 b/metadata/md5-cache/kde-apps/libkgapi-18.04.2
deleted file mode 100644
index 5063feae921d..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/libkgapi.git
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkgapi-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.04.3 b/metadata/md5-cache/kde-apps/libkgapi-18.04.3
new file mode 100644
index 000000000000..2cf6165f3dec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/libkgapi.git
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkgapi-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.2 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.2
deleted file mode 100644
index a1ea787fb257..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.2:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=6
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-apps/marble-18.04.2:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkgeomap-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.04.3 b/metadata/md5-cache/kde-apps/libkgeomap-18.04.3
new file mode 100644
index 000000000000..628e16c29ad6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/marble-18.04.3:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
+EAPI=6
+HOMEPAGE=https://www.digikam.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-apps/marble-18.04.3:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkgeomap-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.2 b/metadata/md5-cache/kde-apps/libkipi-18.04.2
deleted file mode 100644
index cab4a746d1de..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkipi-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.04.3 b/metadata/md5-cache/kde-apps/libkipi-18.04.3
new file mode 100644
index 000000000000..f5c0e23008a2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkipi-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.2 b/metadata/md5-cache/kde-apps/libkleo-18.04.2
deleted file mode 100644
index d2b4d543578e..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-apps/kpimtextedit-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkleo-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.04.3 b/metadata/md5-cache/kde-apps/libkleo-18.04.3
new file mode 100644
index 000000000000..ad60ffcd6e3e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-apps/kpimtextedit-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for encryption handling
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-apps/kpimtextedit-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkleo-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.2 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.2
deleted file mode 100644
index f5e44e7c612b..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkmahjongg-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3
new file mode 100644
index 000000000000..609df6f1c07f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkmahjongg-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.2 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.2
deleted file mode 100644
index c8fe6ff39294..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library to compare files and strings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libkomparediff2-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3
new file mode 100644
index 000000000000..7242b216f816
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library to compare files and strings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libkomparediff2-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.2 b/metadata/md5-cache/kde-apps/libksane-18.04.2
deleted file mode 100644
index 8398502d64ec..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kwallet debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.44.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libksane-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksane-18.04.3 b/metadata/md5-cache/kde-apps/libksane-18.04.3
new file mode 100644
index 000000000000..25235fff617f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kwallet debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.46.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libksane-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=664e3e3594d4876781098b28c1af630a
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.2 b/metadata/md5-cache/kde-apps/libksieve-18.04.2
deleted file mode 100644
index a19aef15161a..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/libksieve-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.04.3 b/metadata/md5-cache/kde-apps/libksieve-18.04.3
new file mode 100644
index 000000000000..feae6aa136c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/libksieve-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.2 b/metadata/md5-cache/kde-apps/libktnef-18.04.2
deleted file mode 100644
index 86fb3e97f873..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcalutils-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/ktnef-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.04.3 b/metadata/md5-cache/kde-apps/libktnef-18.04.3
new file mode 100644
index 000000000000..0d161f50e091
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling TNEF data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcalutils-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/ktnef-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.2 b/metadata/md5-cache/kde-apps/lokalize-18.04.2
deleted file mode 100644
index b55af8eca1a4..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/lokalize-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a6fb43682a57a747af2678e0e1f3300
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.04.3 b/metadata/md5-cache/kde-apps/lokalize-18.04.3
new file mode 100644
index 000000000000..db781791a092
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/lokalize https://l10n.kde.org/tools
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[sqlite] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/lokalize-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd242b06ce6914d100a89abe5ee4b707
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.2 b/metadata/md5-cache/kde-apps/lskat-18.04.2
deleted file mode 100644
index 3945b521f6cb..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Skat game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kguiaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/lskat-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/lskat-18.04.3 b/metadata/md5-cache/kde-apps/lskat-18.04.3
new file mode 100644
index 000000000000..a556b4670452
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Skat game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/lskat-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.2 b/metadata/md5-cache/kde-apps/mailcommon-18.04.2
deleted file mode 100644
index 1c2a4f6545c0..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=kde-apps/messagelib-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/mailcommon-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.04.3 b/metadata/md5-cache/kde-apps/mailcommon-18.04.3
new file mode 100644
index 000000000000..9bc985b89c03
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common mail library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=kde-apps/messagelib-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/mailcommon-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.2 b/metadata/md5-cache/kde-apps/mailimporter-18.04.2
deleted file mode 100644
index cac0d554c173..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/mailimporter-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.04.3 b/metadata/md5-cache/kde-apps/mailimporter-18.04.3
new file mode 100644
index 000000000000..d422fa349b3d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to import mail from various sources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/mailimporter-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.2 b/metadata/md5-cache/kde-apps/marble-18.04.2
deleted file mode 100644
index 787418ea370e..000000000000
--- a/metadata/md5-cache/kde-apps/marble-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=6
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/krunner-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5/18.04
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/marble-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/marble-18.04.3 b/metadata/md5-cache/kde-apps/marble-18.04.3
new file mode 100644
index 000000000000..75f8dbd30748
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=6
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 aprs? ( >=dev-qt/qtserialport-5.9.4:5 ) dbus? ( >=dev-qt/qtdbus-5.9.4:5 ) designer? ( >=dev-qt/designer-5.9.4:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.4:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5/18.04
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/marble-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.2 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.2
deleted file mode 100644
index 494de81a7625..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/mailimporter-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/mbox-importer-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-18.04.3
new file mode 100644
index 000000000000..7ab4a6a9484c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/mailimporter-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/mbox-importer-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.2 b/metadata/md5-cache/kde-apps/messagelib-18.04.2
deleted file mode 100644
index d86ed634b7fb..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=kde-frameworks/syntax-highlighting-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/grantleetheme-18.04.2:5 >=kde-apps/incidenceeditor-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kdepim-apps-libs-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kldap-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmbox-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libgravatar-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/messagelib-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.04.3 b/metadata/md5-cache/kde-apps/messagelib-18.04.3
new file mode 100644
index 000000000000..b255ec71aa5b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmbox-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for messaging functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/grantleetheme-18.04.3:5 >=kde-apps/incidenceeditor-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kdepim-apps-libs-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kldap-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmbox-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libgravatar-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/libkleo-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/messagelib-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.2 b/metadata/md5-cache/kde-apps/minuet-18.04.2
deleted file mode 100644
index 02b67d0166a1..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE Software for Music Education
-EAPI=6
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/minuet-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/minuet-18.04.3 b/metadata/md5-cache/kde-apps/minuet-18.04.3
new file mode 100644
index 000000000000..6e2a91c633d8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE Software for Music Education
+EAPI=6
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/minuet-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.2 b/metadata/md5-cache/kde-apps/okular-18.04.2
deleted file mode 100644
index 24d2e30368bd..000000000000
--- a/metadata/md5-cache/kde-apps/okular-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.44.0:5 >=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjs-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kpty-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/threadweaver-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.44.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.2:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.44.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.44.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/okular-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6dcb7fb101c93f990cc929dc1a5adb9
diff --git a/metadata/md5-cache/kde-apps/okular-18.04.3 b/metadata/md5-cache/kde-apps/okular-18.04.3
new file mode 100644
index 000000000000..22ebee66f054
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.46.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.3:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.46.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-18.04.3:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.04.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.46.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.46.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/okular-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a6dcb7fb101c93f990cc929dc1a5adb9
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.2 b/metadata/md5-cache/kde-apps/palapeli-18.04.2
deleted file mode 100644
index d8b73ba8400a..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/palapeli/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/palapeli-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.04.3 b/metadata/md5-cache/kde-apps/palapeli-18.04.3
new file mode 100644
index 000000000000..c5a089ad1277
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/palapeli/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/palapeli-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.2 b/metadata/md5-cache/kde-apps/parley-18.04.2
deleted file mode 100644
index b38d6f8b2606..000000000000
--- a/metadata/md5-cache/kde-apps/parley-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-18.04.2:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/libkeduvocdocument-18.04.2:5 >=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kross-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-frameworks/sonnet-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/parley-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/parley-18.04.3 b/metadata/md5-cache/kde-apps/parley-18.04.3
new file mode 100644
index 000000000000..97a926bbf507
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-18.04.3:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/libkeduvocdocument-18.04.3:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/parley-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.2 b/metadata/md5-cache/kde-apps/picmi-18.04.2
deleted file mode 100644
index b80b4180a0de..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/libkdegames-18.04.2:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/picmi-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/picmi-18.04.3 b/metadata/md5-cache/kde-apps/picmi-18.04.3
new file mode 100644
index 000000000000..8152cc377cf6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/picmi-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.2
deleted file mode 100644
index 452a79e5c969..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/kmime-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=kde-apps/mailcommon-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/pim-data-exporter-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3
new file mode 100644
index 000000000000..9b8cb3d9a8a1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kidentitymanagement-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/kmime-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=kde-apps/mailcommon-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/pim-data-exporter-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d079eec90f0277247561f36175046cf0
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.2
deleted file mode 100644
index 74ba1a1b2a76..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kwallet-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/akonadi-mime-18.04.2:5 >=kde-apps/calendarsupport-18.04.2:5 >=kde-apps/kcalcore-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kmailtransport-18.04.2:5 >=kde-apps/libksieve-18.04.2:5 >=kde-apps/pimcommon-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/pim-sieve-editor-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3
new file mode 100644
index 000000000000..2a34d806516a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/akonadi-mime-18.04.3:5 >=kde-apps/calendarsupport-18.04.3:5 >=kde-apps/kcalcore-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kmailtransport-18.04.3:5 >=kde-apps/libksieve-18.04.3:5 >=kde-apps/pimcommon-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/pim-sieve-editor-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.2 b/metadata/md5-cache/kde-apps/pimcommon-18.04.2
deleted file mode 100644
index 35b56d10b267..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.44.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.04.2:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kitemmodels-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=kde-apps/akonadi-18.04.2:5 >=kde-apps/akonadi-contacts-18.04.2:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kimap-18.04.2:5 >=kde-apps/kpimtextedit-18.04.2:5 >=kde-apps/libkdepim-18.04.2:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/pimcommon-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.04.3 b/metadata/md5-cache/kde-apps/pimcommon-18.04.3
new file mode 100644
index 000000000000..58a5636c339f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.46.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.04.3:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/akonadi-18.04.3:5 >=kde-apps/akonadi-contacts-18.04.3:5 >=kde-apps/kcontacts-18.04.3:5 >=kde-apps/kimap-18.04.3:5 >=kde-apps/kpimtextedit-18.04.3:5 >=kde-apps/libkdepim-18.04.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/pimcommon-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.2
deleted file mode 100644
index ee1fa1116f97..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
-RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.2 >=kde-apps/ktp-approver-18.04.2 >=kde-apps/ktp-auth-handler-18.04.2 >=kde-apps/ktp-common-internals-18.04.2 >=kde-apps/ktp-contact-list-18.04.2 >=kde-apps/ktp-contact-runner-18.04.2 >=kde-apps/ktp-desktop-applets-18.04.2 >=kde-apps/ktp-filetransfer-handler-18.04.2 >=kde-apps/ktp-kded-module-18.04.2 >=kde-apps/ktp-send-file-18.04.2 >=kde-apps/ktp-text-ui-18.04.2 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.2 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3
new file mode 100644
index 000000000000..1218955b72d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.04.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
+RDEPEND=>=kde-apps/ktp-accounts-kcm-18.04.3 >=kde-apps/ktp-approver-18.04.3 >=kde-apps/ktp-auth-handler-18.04.3 >=kde-apps/ktp-common-internals-18.04.3 >=kde-apps/ktp-contact-list-18.04.3 >=kde-apps/ktp-contact-runner-18.04.3 >=kde-apps/ktp-desktop-applets-18.04.3 >=kde-apps/ktp-filetransfer-handler-18.04.3 >=kde-apps/ktp-kded-module-18.04.3 >=kde-apps/ktp-send-file-18.04.3 >=kde-apps/ktp-text-ui-18.04.3 gstreamer? ( >=kde-apps/ktp-call-ui-18.04.3 ) !kde-apps/plasma-telepathy-meta:4
+SLOT=5
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.2 b/metadata/md5-cache/kde-apps/poxml-18.04.2
deleted file mode 100644
index 3044422126a0..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/poxml-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/poxml-18.04.3 b/metadata/md5-cache/kde-apps/poxml-18.04.3
new file mode 100644
index 000000000000..9c8f9bf6fde7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/poxml-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.2 b/metadata/md5-cache/kde-apps/print-manager-18.04.2
deleted file mode 100644
index 1b03e7e17702..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/plasma-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups >=kde-plasma/kde-cli-tools-5.12.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/print-manager-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.04.3 b/metadata/md5-cache/kde-apps/print-manager-18.04.3
new file mode 100644
index 000000000000..c848f6472176
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups >=kde-plasma/kde-cli-tools-5.12.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/print-manager-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.2 b/metadata/md5-cache/kde-apps/rocs-18.04.2
deleted file mode 100644
index ac5432551c9a..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-18.04.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kitemviews-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/rocs-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/rocs-18.04.3 b/metadata/md5-cache/kde-apps/rocs-18.04.3
new file mode 100644
index 000000000000..b6de791ff527
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-18.04.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/rocs-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.2
deleted file mode 100644
index 1ffd7a158b1a..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet extension for signond
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.44.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/signon-kwallet-extension-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3
new file mode 100644
index 000000000000..b6febe75b9c5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.46.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet extension for signond
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kwallet-5.46.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/signon-kwallet-extension-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.2 b/metadata/md5-cache/kde-apps/spectacle-18.04.2
deleted file mode 100644
index df12d87ee6e8..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.2:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdeclarative-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knotifications-5.44.0:5 >=kde-frameworks/kservice-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.2:5= ) share? ( >=kde-frameworks/purpose-5.44.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/spectacle-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.04.3 b/metadata/md5-cache/kde-apps/spectacle-18.04.3
new file mode 100644
index 000000000000..1566f3ff341d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.3:5= ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screenshot capture utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kipi share debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.04.3:5= ) share? ( >=kde-frameworks/purpose-5.46.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/spectacle-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/step-18.04.2 b/metadata/md5-cache/kde-apps/step-18.04.2
deleted file mode 100644
index d15411cd57fd..000000000000
--- a/metadata/md5-cache/kde-apps/step-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interactive physics simulator
-EAPI=6
-HOMEPAGE=https://edu.kde.org/step
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/knewstuff-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kplotting-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/step-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/step-18.04.3 b/metadata/md5-cache/kde-apps/step-18.04.3
new file mode 100644
index 000000000000..9cb8710f30f8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interactive physics simulator
+EAPI=6
+HOMEPAGE=https://edu.kde.org/step
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/step-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e3daf02a171516c0be2aa1791d7e620d
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.2 b/metadata/md5-cache/kde-apps/svgpart-18.04.2
deleted file mode 100644
index aaa379765e45..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/svgpart-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.04.3 b/metadata/md5-cache/kde-apps/svgpart-18.04.3
new file mode 100644
index 000000000000..8a7038772aba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/svgpart-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.2 b/metadata/md5-cache/kde-apps/sweeper-18.04.2
deleted file mode 100644
index 22b16eed506d..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.44.0:5 >=kde-frameworks/kbookmarks-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/sweeper-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.04.3 b/metadata/md5-cache/kde-apps/sweeper-18.04.3
new file mode 100644
index 000000000000..64ebc8fe050c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/sweeper-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.2 b/metadata/md5-cache/kde-apps/syndication-18.04.2
deleted file mode 100644
index 5725dd85e569..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/syndication-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/syndication-18.04.3 b/metadata/md5-cache/kde-apps/syndication-18.04.3
new file mode 100644
index 000000000000..9fd6372653ea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/syndication-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtxml-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/syndication-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.2 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.2
deleted file mode 100644
index 94b7ca0a8d70..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.2:5 >=kde-apps/libkexiv2-18.04.2:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.2:5 >=kde-apps/libkexiv2-18.04.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/kdegraphics-thumbnailers-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.04.3 b/metadata/md5-cache/kde-apps/thumbnailers-18.04.3
new file mode 100644
index 000000000000..64432aa0c404
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.3:5 >=kde-apps/libkexiv2-18.04.3:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.04.3:5 >=kde-apps/libkexiv2-18.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/kdegraphics-thumbnailers-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.2 b/metadata/md5-cache/kde-apps/umbrello-18.04.2
deleted file mode 100644
index 4778f1ef6468..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.44.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE UML Modeller
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.44.0:5 >=kde-frameworks/kcompletion-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kconfigwidgets-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kiconthemes-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=kde-frameworks/kjobwidgets-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-frameworks/ktextwidgets-5.44.0:5 >=kde-frameworks/kwidgetsaddons-5.44.0:5 >=kde-frameworks/kwindowsystem-5.44.0:5 >=kde-frameworks/kxmlgui-5.44.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/umbrello-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.04.3 b/metadata/md5-cache/kde-apps/umbrello-18.04.3
new file mode 100644
index 000000000000..c18e58aed52f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.46.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE UML Modeller
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/umbrello-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.2
deleted file mode 100644
index f0f3fd2e664e..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdnssd-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/kio-5.44.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.04.2/src/zeroconf-ioslave-18.04.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3
new file mode 100644
index 000000000000..c104837a01db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.04.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdnssd-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.04.3/src/zeroconf-ioslave-18.04.3.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 75a346e53798..f17b47e6b041 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.0.4 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.0.4
deleted file mode 100644
index ee88862bfdc3..000000000000
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
-EAPI=6
-HOMEPAGE=https://protonmail.com/bridge/
-KEYWORDS=~amd64
-LICENSE=MIT protonmail-bridge-EULA
-RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio virtual/opengl
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://protonmail.com/download/protonmail-bridge-1.0.4-1.x86_64.rpm
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19ffe1d2a6327105f7f56fb52c3f06fa
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.0.5 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.0.5
new file mode 100644
index 000000000000..c51b03ef4a54
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.0.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=7
+HOMEPAGE=https://protonmail.com/bridge/
+KEYWORDS=~amd64
+LICENSE=MIT protonmail-bridge-EULA
+RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://protonmail.com/download/protonmail-bridge-1.0.5-1.x86_64.rpm
+_eclasses_=eutils	5b8ce72259e08104b337fe28c6de5dbc	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_md5_=f68b8d62ac4d486259ff82e48fde61c8
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index edd8bcb9c7b3..2b492491a692 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.8.3 b/metadata/md5-cache/media-libs/harfbuzz-1.8.3
new file mode 100644
index 000000000000..82435999becc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
+DESCRIPTION=An OpenType text shaping engine
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=de378c7861cfcf1db19b642b18400ab7
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.2-r3 b/metadata/md5-cache/media-libs/lilv-0.24.2-r3
new file mode 100644
index 000000000000..c38de2b3a802
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lilv-0.24.2-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
+EAPI=6
+HOMEPAGE=http://drobilla.net/software/lilv/
+IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
+LICENSE=ISC
+RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=http://download.drobilla.net/lilv-0.24.2.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=8935f021d5d240518404ac07dc37bd8f
diff --git a/metadata/md5-cache/media-libs/rubberband-1.8.1-r2 b/metadata/md5-cache/media-libs/rubberband-1.8.1-r2
new file mode 100644
index 000000000000..fe2fd0e4481d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
+EAPI=7
+HOMEPAGE=https://www.breakfastquay.com/rubberband/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=52cf4269e6832c72492431e0aa3c41f9
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index d5298748f1a7..084a94f25d7c 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/calf-0.90.0-r1 b/metadata/md5-cache/media-plugins/calf-0.90.0-r1
new file mode 100644
index 000000000000..2637aa0ca714
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/calf-0.90.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A set of open source instruments and effects for digital audio workstations
+EAPI=6
+HOMEPAGE=http://calf-studio-gear.org/
+IUSE=cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
+SLOT=0
+SRC_URI=https://github.com/calf-studio-gear/calf/archive/0.90.0.tar.gz -> calf-0.90.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=94ca3aacd8f904030a3387617b2c231c
diff --git a/metadata/md5-cache/media-plugins/calf-9999 b/metadata/md5-cache/media-plugins/calf-9999
index c95e96df9e93..ed58d245787f 100644
--- a/metadata/md5-cache/media-plugins/calf-9999
+++ b/metadata/md5-cache/media-plugins/calf-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c7d034b83ac20b8b10a03d3837e7231f
+_md5_=94ca3aacd8f904030a3387617b2c231c
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9c4df9a7da8a..a401121a6a5c 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/elisa-0.2.1 b/metadata/md5-cache/media-sound/elisa-0.2.1
deleted file mode 100644
index ce69c43a4fce..000000000000
--- a/metadata/md5-cache/media-sound/elisa-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5[gstreamer] >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 mpris? ( >=kde-frameworks/kdbusaddons-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple music player by KDE
-EAPI=6
-HOMEPAGE=https://community.kde.org/Elisa
-IUSE=mpris semantic-desktop debug +handbook test
-KEYWORDS=~amd64
-LICENSE=LGPL-3+
-RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5[gstreamer] >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 mpris? ( >=kde-frameworks/kdbusaddons-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/elisa/0.2.1/elisa-0.2.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=057ab3089f224b5488621346f2e2e626
diff --git a/metadata/md5-cache/media-sound/elisa-0.2.1-r1 b/metadata/md5-cache/media-sound/elisa-0.2.1-r1
new file mode 100644
index 000000000000..fdb41bcbbc50
--- /dev/null
+++ b/metadata/md5-cache/media-sound/elisa-0.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5[gstreamer] >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 mpris? ( >=kde-frameworks/kdbusaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple music player by KDE
+EAPI=6
+HOMEPAGE=https://community.kde.org/Elisa
+IUSE=mpris semantic-desktop debug +handbook test
+KEYWORDS=~amd64
+LICENSE=LGPL-3+
+RDEPEND=>=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kfilemetadata-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5[gstreamer] >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 mpris? ( >=kde-frameworks/kdbusaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/elisa/0.2.1/elisa-0.2.1.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	37630108e4f125721941b09a9b3f36af	kde5-functions	1ef6ad49b6dfedfdb4d566ea3d2790c1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba0c909edbc27b1c09023a1e09864db2
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.1.3 b/metadata/md5-cache/media-sound/pulseeffects-4.1.3
new file mode 100644
index 000000000000..7e2b41e31478
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=sys-apps/sed-4 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=6
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf mda-lv2 rubberband
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) media-sound/pulseaudio
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.1.3.tar.gz -> pulseeffects-4.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b24136b646b4ae99acb12ea122d1c947
diff --git a/metadata/md5-cache/media-sound/pulseeffects-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
index 8a728cf87d37..9115e13f0377 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-9999
+++ b/metadata/md5-cache/media-sound/pulseeffects-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-libs/rubberband >=sys-apps/sed-4 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=sys-apps/sed-4 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=6
 HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=bs2b calf mda-lv2 rubberband
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-libs/rubberband media-sound/pulseaudio[equalizer]
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) media-sound/pulseaudio
 SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f00d07741e117aa6e7b06e723a84ee1a
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f6b0c43181e3c7ff2d2b3d4640dd2f26
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 48f87d5cd422..95a887be5a7c 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/gaupol-0.91 b/metadata/md5-cache/media-video/gaupol-0.91
deleted file mode 100644
index 94c827d7cb85..000000000000
--- a/metadata/md5-cache/media-video/gaupol-0.91
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] spell? ( >=dev-python/pyenchant-1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-text/gtkspell:3 ) dev-util/intltool sys-devel/gettext test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A subtitle editor for text-based subtitles
-EAPI=6
-HOMEPAGE=https://otsaloma.io/gaupol/
-IUSE=spell test python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] spell? ( >=dev-python/pyenchant-1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-text/gtkspell: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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/otsaloma/gaupol/archive/0.91.tar.gz -> gaupol-0.91.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ef00be54dd5a98676d3f4747c631e8d
diff --git a/metadata/md5-cache/media-video/gaupol-1.4.1 b/metadata/md5-cache/media-video/gaupol-1.4.1
new file mode 100644
index 000000000000..4c215d601f4d
--- /dev/null
+++ b/metadata/md5-cache/media-video/gaupol-1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-devel/gettext test? ( app-text/iso-codes dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] spell? ( app-text/gtkspell:3 >=dev-python/pyenchant-1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A subtitle editor for text-based subtitles
+EAPI=6
+HOMEPAGE=https://otsaloma.io/gaupol/
+IUSE=spell test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] spell? ( app-text/gtkspell:3 >=dev-python/pyenchant-1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/otsaloma/gaupol/archive/1.4.1.tar.gz -> gaupol-1.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1073e09a5b296e1a1f5a392eca3dc3ee
diff --git a/metadata/md5-cache/media-video/noad-0.7.3-r1 b/metadata/md5-cache/media-video/noad-0.7.3-r1
index 9fcf4514532b..3191bfd64640 100644
--- a/metadata/md5-cache/media-video/noad-0.7.3-r1
+++ b/metadata/md5-cache/media-video/noad-0.7.3-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=media-gfx/imagemagick media-libs/libmpeg2:= ffmpeg? ( virtual/ffmpeg ) !media-plugins/vdr-markad virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mark commercial Breaks in VDR records
-EAPI=5
+EAPI=6
 HOMEPAGE=http://noad.heliohost.org/
 IUSE=ffmpeg
 KEYWORDS=amd64 x86
@@ -10,4 +10,4 @@ RDEPEND=media-gfx/imagemagick media-libs/libmpeg2:= ffmpeg? ( virtual/ffmpeg ) !
 SLOT=0
 SRC_URI=http://noad.heliohost.org/noad-0.7.3.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2446636f5393568e3bbbc09a1963ed6a
+_md5_=082f5b733d6c8fbf4e55bf7fc679b7d6
diff --git a/metadata/md5-cache/media-video/noad-0.8.6-r1 b/metadata/md5-cache/media-video/noad-0.8.6-r1
index 3d50348f6965..43880a55927f 100644
--- a/metadata/md5-cache/media-video/noad-0.8.6-r1
+++ b/metadata/md5-cache/media-video/noad-0.8.6-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick ) !media-plugins/vdr-markad virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mark commercial breaks in VDR recordings
-EAPI=5
+EAPI=6
 HOMEPAGE=http://noad.net23.net/
 IUSE=+ffmpeg imagemagick libmpeg2
 KEYWORDS=amd64 x86
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ffmpeg libmpeg2 )
 SLOT=0
 SRC_URI=http://noad.net23.net/noad-0.8.6.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03cf26e285b4bdb0303231a390b58873
+_md5_=53ef31382e23526a64ceaeaf49628b4e
diff --git a/metadata/md5-cache/media-video/noad-0.8.6-r2 b/metadata/md5-cache/media-video/noad-0.8.6-r2
index cdb6df627729..a9fa6d7ae975 100644
--- a/metadata/md5-cache/media-video/noad-0.8.6-r2
+++ b/metadata/md5-cache/media-video/noad-0.8.6-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick ) !media-plugins/vdr-markad virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mark commercial breaks in VDR recordings
-EAPI=5
+EAPI=6
 HOMEPAGE=http://noad.net23.net/
 IUSE=+ffmpeg imagemagick libmpeg2
 KEYWORDS=~amd64 ~x86
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ffmpeg libmpeg2 )
 SLOT=0
 SRC_URI=http://noad.net23.net/noad-0.8.6.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=795f720dc54185f24150fd0e594702de
+_md5_=eb09c36a2abe4f95789d58c71134d214
diff --git a/metadata/md5-cache/media-video/noad-0.8.6-r3 b/metadata/md5-cache/media-video/noad-0.8.6-r3
new file mode 100644
index 000000000000..260093563ad7
--- /dev/null
+++ b/metadata/md5-cache/media-video/noad-0.8.6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick ) !media-plugins/vdr-markad virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Mark commercial breaks in VDR recordings
+EAPI=7
+HOMEPAGE=http://noad.net23.net/
+IUSE=+ffmpeg imagemagick libmpeg2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick ) !media-plugins/vdr-markad
+REQUIRED_USE=|| ( ffmpeg libmpeg2 )
+SLOT=0
+SRC_URI=http://noad.net23.net/noad-0.8.6.tar.bz2 http://vdr.websitec.de/download/noad/noad-0.8.6-ffmpeg3.4.diff.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5ae60e81f19fcf1aad3e77318ac79403
diff --git a/metadata/md5-cache/media-video/obs-studio-20.1.0 b/metadata/md5-cache/media-video/obs-studio-20.1.0
deleted file mode 100644
index 273f5ae1b729..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-20.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) imagemagick? ( || ( <media-gfx/imagemagick-7 ( >=media-gfx/imagemagick-7 >=dev-util/cmake-3.9 ) ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=6
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
-SLOT=0
-SRC_URI=https://github.com/jp9000/obs-studio/archive/20.1.0.tar.gz -> obs-studio-20.1.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2633ad4179b30724a12fa842cce05962
diff --git a/metadata/md5-cache/media-video/obs-studio-20.1.3 b/metadata/md5-cache/media-video/obs-studio-20.1.3
deleted file mode 100644
index 791d9a81d475..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-20.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=6
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
-SLOT=0
-SRC_URI=https://github.com/jp9000/obs-studio/archive/20.1.3.tar.gz -> obs-studio-20.1.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bbecc6938f3ab8d130c82cfbdb761da7
diff --git a/metadata/md5-cache/media-video/obs-studio-21.0.2 b/metadata/md5-cache/media-video/obs-studio-21.0.2
index c9ac46587c63..6002214d08ac 100644
--- a/metadata/md5-cache/media-video/obs-studio-21.0.2
+++ b/metadata/md5-cache/media-video/obs-studio-21.0.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] nvenc? ( media-video/ffmpeg:=[nvenc] ) net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
 SLOT=0
-SRC_URI=https://github.com/jp9000/obs-studio/archive/21.0.2.tar.gz -> obs-studio-21.0.2.tar.gz
+SRC_URI=https://github.com/obsproject/obs-studio/archive/21.0.2.tar.gz -> obs-studio-21.0.2.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=488b74d4b105db31b9961b82c21aeaa8
+_md5_=e0681824aacfb6b254cdd5208c99f997
diff --git a/metadata/md5-cache/media-video/obs-studio-21.1.2 b/metadata/md5-cache/media-video/obs-studio-21.1.2
new file mode 100644
index 000000000000..d566b25d3c8e
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-21.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=6
+HOMEPAGE=https://obsproject.com
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+SLOT=0
+SRC_URI=https://github.com/obsproject/obs-studio/archive/21.1.2.tar.gz -> obs-studio-21.1.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac673bc388a85b419c80e72492d7bedb
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index 01d1e4cf895a..3a87224f2e41 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) luajit? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=6
 HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) speexdsp? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
 SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3101df4e27052427662643526fd69daa
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9ba9210538a170238cd257d8ea02a925
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index cf3e94073d27..bdc9a88bc592 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.0.2 b/metadata/md5-cache/net-analyzer/nagstamon-3.0.2
deleted file mode 100644
index 27fe48879c53..000000000000
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=systray monitor for displaying realtime status of several monitoring systems
-EAPI=6
-HOMEPAGE=https://nagstamon.ifw-dresden.de
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.0.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=454b026e2a544307720383374c1483f9
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1 b/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1
new file mode 100644
index 000000000000..b73d938cc22c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=systray monitor for displaying realtime status of several monitoring systems
+EAPI=6
+HOMEPAGE=https://nagstamon.ifw-dresden.de
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=423b5be1666116c2213d99c4be95824b
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 21a8e573b673..cccae9a84bf0 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/getdns-1.4.2 b/metadata/md5-cache/net-dns/getdns-1.4.2
deleted file mode 100644
index 55c3853c75ad..000000000000
--- a/metadata/md5-cache/net-dns/getdns-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/libbsd:= dev-libs/libyaml:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idn? ( net-dns/libidn2:= ) unbound? ( >=net-dns/unbound-1.4.16:= ) libevent? ( dev-libs/libevent:= ) libev? ( dev-libs/libev:= ) libuv? ( dev-libs/libuv:= ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DESCRIPTION=Modern asynchronous DNS API
-EAPI=6
-HOMEPAGE=https://getdnsapi.net/
-IUSE=stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs +filecaps
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libbsd:= dev-libs/libyaml:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idn? ( net-dns/libidn2:= ) unbound? ( >=net-dns/unbound-1.4.16:= ) libevent? ( dev-libs/libevent:= ) libev? ( dev-libs/libev:= ) libuv? ( dev-libs/libuv:= ) stubby? ( sys-libs/libcap:= )
-SLOT=0
-SRC_URI=https://getdnsapi.net/releases/getdns-1-4-2/getdns-1.4.2.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9e166f8ebf1229e43d00bd85672e35cf
diff --git a/metadata/md5-cache/net-dns/getdns-1.4.2-r1 b/metadata/md5-cache/net-dns/getdns-1.4.2-r1
new file mode 100644
index 000000000000..6651baa3b639
--- /dev/null
+++ b/metadata/md5-cache/net-dns/getdns-1.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-libs/libbsd:= dev-libs/libyaml:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idn? ( net-dns/libidn2:= ) unbound? ( >=net-dns/unbound-1.4.16:= ) libevent? ( dev-libs/libevent:= ) libev? ( dev-libs/libev:= ) libuv? ( dev-libs/libuv:= ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig
+DESCRIPTION=Modern asynchronous DNS API
+EAPI=6
+HOMEPAGE=https://getdnsapi.net/
+IUSE=stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs +filecaps
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libbsd:= dev-libs/libyaml:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) idn? ( net-dns/libidn2:= ) unbound? ( >=net-dns/unbound-1.4.16:= ) libevent? ( dev-libs/libevent:= ) libev? ( dev-libs/libev:= ) libuv? ( dev-libs/libuv:= ) stubby? ( sys-libs/libcap:= )
+SLOT=0
+SRC_URI=https://getdnsapi.net/releases/getdns-1-4-2/getdns-1.4.2.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=7a4d91fb1409333b84e0465ab08fb72f
diff --git a/metadata/md5-cache/net-dns/knot-2.6.7 b/metadata/md5-cache/net-dns/knot-2.6.7
deleted file mode 100644
index 53be3ad60cfa..000000000000
--- a/metadata/md5-cache/net-dns/knot-2.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd ) virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
-DESCRIPTION=High-performance authoritative-only DNS server
-EAPI=6
-HOMEPAGE=https://www.knot-dns.cz/
-IUSE=doc caps +fastparser idn libidn2 systemd +utils +dnsproxy dnstap +noudp +onlinesign rosedb +rrl +stats +synthrecord +whoami
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.6.7.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b9ff11e73ec11667a0353cc204a79f95
diff --git a/metadata/md5-cache/net-dns/knot-2.6.8 b/metadata/md5-cache/net-dns/knot-2.6.8
new file mode 100644
index 000000000000..a703cb909a02
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd ) virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=6
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn libidn2 systemd +utils +dnsproxy dnstap +noudp +onlinesign rosedb +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu dev-python/lmdb net-libs/gnutls caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( net-dns/libidn2 ) ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.6.8.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b9ff11e73ec11667a0353cc204a79f95
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 793e8a96b40b..b1e03aaf388a 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/err-1.7.1-r1 b/metadata/md5-cache/net-im/err-1.7.1-r1
deleted file mode 100644
index 53b919c551e8..000000000000
--- a/metadata/md5-cache/net-im/err-1.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable
-EAPI=5
-HOMEPAGE=https://gbin.github.com/err/
-IUSE=irc +plugins python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyfire[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xmpppy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/yapsy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] irc? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) plugins? ( dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/e/err/err-1.7.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80f57f4ba17662e2cbca4789d74b5908
diff --git a/metadata/md5-cache/net-im/err-1.7.1-r2 b/metadata/md5-cache/net-im/err-1.7.1-r2
new file mode 100644
index 000000000000..b08b187d277f
--- /dev/null
+++ b/metadata/md5-cache/net-im/err-1.7.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Plugin based chatbot designed to be easily deployable, extensible and maintainable
+EAPI=7
+HOMEPAGE=https://errbot.io/
+IUSE=irc +plugins python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyfire[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xmpppy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/yapsy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] irc? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) plugins? ( dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/e/err/err-1.7.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eutils	5b8ce72259e08104b337fe28c6de5dbc	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=ce0e06a54449dd4db304e1de3c875d36
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index af7b37cc498d..8d7c8ac3e4e7 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/curl-7.61.0 b/metadata/md5-cache/net-misc/curl-7.61.0
index 49dc4dcd5ef0..290751352aee 100644
--- a/metadata/md5-cache/net-misc/curl-7.61.0
+++ b/metadata/md5-cache/net-misc/curl-7.61.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.61.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef1e06c15ebc5cb5e8a2be8cb9a4a7f0
+_md5_=38caf0d6e70209d798a59a2b6346668d
diff --git a/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1 b/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
index 161b5d41e873..340cb175793a 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
+++ b/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.gns3.net/
 IUSE=python_targets_python3_4
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=net-misc/gns3-converter-1.3.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] =net-misc/gns3-server-1.5.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=net-misc/gns3-converter-1.3.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ~net-misc/gns3-server-1.5.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v1.5.3.1.tar.gz -> gns3-gui-1.5.3.1.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb9b6861257e3ede5980dc2fd5528db6
+_md5_=48f06070bd9a3e97ce0ff6d6698d4298
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1 b/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
index 6ea7a724accd..16a966617c1d 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.gns3.net/
 IUSE=python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =net-misc/gns3-server-2.0.3-r1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~net-misc/gns3-server-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.0.3.tar.gz -> gns3-gui-2.0.3.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76f8c85d889847bed25cd2d74d6ee183
+_md5_=da32c156c77b22efb32846a0cbe61da9
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1 b/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
index bc9505e9cc59..1cfdb3ac379f 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.1.3.tar.gz -> gns3-gui-2.1.3.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=601025fa7f2231d2092568090b5e0c56
+_md5_=071a06858974cbbead1dfc1a28eb9079
diff --git a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1 b/metadata/md5-cache/net-misc/gns3-server-1.5.3.1
deleted file mode 100644
index 84bd327be191..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-1.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/aiohttp-cors-0.5.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/raven-5.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/typing-3.5.3.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/yarl-0.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v1.5.3.1.tar.gz -> gns3-server-1.5.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac22b1dbfae14f8ca74332f35a394e46
diff --git a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1 b/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
new file mode 100644
index 000000000000..bcb07e593397
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=6
+HOMEPAGE=http://www.gns3.net/
+IUSE=python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-1.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/aiohttp-cors-0.5.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/raven-5.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] virtual/python-typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/yarl-0.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v1.5.3.1.tar.gz -> gns3-server-1.5.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a41e572c684709b3d11f3e82287e5fbb
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r1 b/metadata/md5-cache/net-misc/gns3-server-2.0.3-r1
deleted file mode 100644
index 4661304d7b54..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 =dev-python/aiohttp-1.3.5*[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/aiohttp-cors-0.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/raven-5.23.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/typing-3.5.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/yarl-0.9.8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.0.3.tar.gz -> gns3-server-2.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=051465be0a058c53cec61ed38a5e2eb9
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2 b/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
new file mode 100644
index 000000000000..7081a9e350a8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=6
+HOMEPAGE=http://www.gns3.net/
+IUSE=python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-emulation/dynamips-0.2.12 =dev-python/aiohttp-1.3.5*[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/aiohttp-cors-0.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/raven-5.23.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/yarl-0.9.8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.0.3.tar.gz -> gns3-server-2.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=925663ed098b2610e005feee29ea95f3
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r1 b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r1
deleted file mode 100644
index d47f2179176f..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-2.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/aiohttp-cors-0.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/aiohttp-cors-0.5.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/raven-5.23.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prompt_toolkit[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/typing-3.5.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.3.tar.gz -> gns3-server-2.1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=268738fe9d2dda960afa545d1604d4c7
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3 b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
new file mode 100644
index 000000000000..cf61dd8647fa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=6
+HOMEPAGE=http://www.gns3.net/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-2.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/aiohttp-cors-0.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/aiohttp-cors-0.5.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/raven-5.23.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prompt_toolkit[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.3.tar.gz -> gns3-server-2.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ee254ff018325d29985a9954e701e1a
diff --git a/metadata/md5-cache/net-misc/kea-1.4.0 b/metadata/md5-cache/net-misc/kea-1.4.0
deleted file mode 100644
index 4193af5b8a6b..000000000000
--- a/metadata/md5-cache/net-misc/kea-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
-DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
-EAPI=6
-HOMEPAGE=http://www.isc.org/kea/
-IUSE=openssl samples
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC BSD SSLeay GPL-2
-RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.4.0.tar.gz ftp://ftp.isc.org/isc/kea/1.4.0/kea-1.4.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4f3dca22e0173dbcf3e274f0138cef24
diff --git a/metadata/md5-cache/net-misc/kea-1.4.0_p1 b/metadata/md5-cache/net-misc/kea-1.4.0_p1
new file mode 100644
index 000000000000..e4775e85f515
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kea-1.4.0_p1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare
+DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
+DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
+EAPI=6
+HOMEPAGE=http://www.isc.org/kea/
+IUSE=openssl samples
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC BSD SSLeay GPL-2
+RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.4.0-P1.tar.gz ftp://ftp.isc.org/isc/kea/1.4.0-P1/kea-1.4.0-P1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=4f3dca22e0173dbcf3e274f0138cef24
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
index f42475c5c5b1..22edf2bf2c5a 100644
--- a/metadata/md5-cache/net-misc/kea-9999
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -8,4 +8,4 @@ LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4f3dca22e0173dbcf3e274f0138cef24
+_md5_=37e0135eab621ae7bf7e008baa00042c
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 54e79d07e6c6..05348a2151f6 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-filters-1.20.2 b/metadata/md5-cache/net-print/cups-filters-1.20.2
deleted file mode 100644
index 6b32f4823156..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.20.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
-DESCRIPTION=Cups filters
-EAPI=6
-HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
-IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
-LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.20.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e46eed5c6b88f096b6451e612041a251
diff --git a/metadata/md5-cache/net-print/cups-filters-1.20.4 b/metadata/md5-cache/net-print/cups-filters-1.20.4
new file mode 100644
index 000000000000..ca190d7f70c5
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.20.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
+DESCRIPTION=Cups filters
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
+IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.20.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e46eed5c6b88f096b6451e612041a251
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index 3f6f0d396e6c..dc0d55219953 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -8,4 +8,4 @@ LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bzr	2378e021cde927edeb1564ca0387b29a	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b1ae67ed7bcdb68cd173755fd207872
+_md5_=e46eed5c6b88f096b6451e612041a251
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 9a79e2781281..5049860b717c 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/unifi-5.6.39 b/metadata/md5-cache/net-wireless/unifi-5.6.39
deleted file mode 100644
index dbc6959a5989..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.6.39
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.6
-SRC_URI=https://dl.ubnt.com/unifi/5.6.39/UniFi.unix.zip -> unifi-5.6.39.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=32cfb64818c90744463e3f9a750f68f0
diff --git a/metadata/md5-cache/net-wireless/unifi-5.7.28 b/metadata/md5-cache/net-wireless/unifi-5.7.28
deleted file mode 100644
index 5debeeaa1186..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.7.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.7
-SRC_URI=https://dl.ubnt.com/unifi/5.7.28-5c442c6b54/UniFi.unix.zip -> unifi-5.7.28.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1e22c30bf4d482a93ad6aeefcfd07a00
diff --git a/metadata/md5-cache/net-wireless/unifi-5.7.28-r1 b/metadata/md5-cache/net-wireless/unifi-5.7.28-r1
deleted file mode 100644
index f90f5a84855b..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.7.28-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.7
-SRC_URI=https://dl.ubnt.com/unifi/5.7.28-5c442c6b54/UniFi.unix.zip -> unifi-5.7.28.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f13ec294eaf992ab8536ac0d0a1c2a40
diff --git a/metadata/md5-cache/net-wireless/unifi-5.8.23 b/metadata/md5-cache/net-wireless/unifi-5.8.23
deleted file mode 100644
index 8d7dad5bb464..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.8.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.8
-SRC_URI=https://dl.ubnt.com/unifi/5.8.23-d5a5bbfda4/UniFi.unix.zip -> unifi-5.8.23.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=27477a8ea9d3174bebc045131de24c7e
diff --git a/metadata/md5-cache/net-wireless/unifi-5.8.23-r1 b/metadata/md5-cache/net-wireless/unifi-5.8.23-r1
deleted file mode 100644
index 0c2990d77d41..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.8.23-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.8
-SRC_URI=https://dl.ubnt.com/unifi/5.8.23-d5a5bbfda4/UniFi.unix.zip -> unifi-5.8.23.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9f015736667c2ffd8b3f880b16091774
diff --git a/metadata/md5-cache/net-wireless/unifi-5.8.24 b/metadata/md5-cache/net-wireless/unifi-5.8.24
deleted file mode 100644
index 49f6a8736b47..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.8.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.8
-SRC_URI=https://dl.ubnt.com/unifi/5.8.24/UniFi.unix.zip -> unifi-5.8.24.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=380db2f3795384dc4e7704f6ffa3b6e6
diff --git a/metadata/md5-cache/net-wireless/unifi-5.8.25 b/metadata/md5-cache/net-wireless/unifi-5.8.25
new file mode 100644
index 000000000000..a48eea221ee8
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.8.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.8
+SRC_URI=https://dl.ubnt.com/unifi/5.8.25-34502471b9/UniFi.unix.zip -> unifi-5.8.25.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9191a9c0c8fa0382229ae83d1ed2898d
diff --git a/metadata/md5-cache/net-wireless/unifi-5.9.12 b/metadata/md5-cache/net-wireless/unifi-5.9.12
new file mode 100644
index 000000000000..4c6ed2154578
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.9.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.9
+SRC_URI=https://dl.ubnt.com/unifi/5.9.12-ZD3vz8Yw57I/UniFi.unix.zip -> unifi-5.9.12.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=aaa6ec85be15c5490e4a2c5b177a7d49
diff --git a/metadata/md5-cache/net-wireless/unifi-5.9.4 b/metadata/md5-cache/net-wireless/unifi-5.9.4
deleted file mode 100644
index 17ae08b85292..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.9.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.9
-SRC_URI=https://dl.ubnt.com/unifi/5.9.4-b647df56b7/UniFi.unix.zip -> unifi-5.9.4.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=124ee2dac71bca081c41866e1c2930a8
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index af0be81cea95..0936b38ffd8c 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/dlib-19.9 b/metadata/md5-cache/sci-libs/dlib-19.9
new file mode 100644
index 000000000000..9f2ee61c9fb2
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/dlib-19.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Numerical and networking C++ library
+EAPI=6
+HOMEPAGE=http://dlib.net/
+IUSE=cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
+SLOT=0/19.9
+SRC_URI=https://github.com/davisking/dlib/archive/v19.9.tar.gz -> dlib-19.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21b8f3f96368682abc510ca950fe93a4
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.9.0 b/metadata/md5-cache/sci-libs/tensorflow-1.9.0
new file mode 100644
index 000000000000..6d5a8d304104
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) mpi? ( virtual/mpi ) system-libs? ( app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/flatbuffers-1.8.0 >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.12.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/curl sys-libs/zlib jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) !python? ( dev-lang/python ) app-arch/unzip >=dev-util/bazel-0.14.0 dev-java/java-config dev-python/mock system-libs? ( dev-lang/nasm dev-lang/swig dev-python/cython )
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=6
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=cuda jemalloc mpi +python system-libs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6.0 ) mpi? ( virtual/mpi ) system-libs? ( app-arch/snappy dev-db/lmdb dev-db/sqlite >=dev-libs/flatbuffers-1.8.0 >=dev-libs/jsoncpp-1.8.4 dev-libs/libpcre >=dev-libs/protobuf-3.6.0 >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.12.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/curl sys-libs/zlib jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.9.0.tar.gz -> tensorflow-1.9.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.9.0.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz ) python? ( https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/53f822805e77ea7715f5b52c592a162c515c7219.tar.gz -> google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz https://github.com/llvm-mirror/llvm/archive/fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz -> llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz !system-libs? ( http://ftp.exim.org/pub/pcre/pcre-8.42.tar.gz http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz https://curl.haxx.se/download/curl-7.60.0.tar.gz https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-v1.9.0.tar.gz https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz ) ) !system-libs? ( http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2 https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz https://github.com/google/re2/archive/2018-04-01.tar.gz -> re2-2018-04-01.tar.gz https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip https://zlib.net/zlib-1.2.11.tar.gz )
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cuda	626969678b9c5735753d8a380c6f295b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7765cc82e416f9d7bda03910f7471388
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index edfc1fd651d1..9f71c5ee7e10 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/glpk-4.63 b/metadata/md5-cache/sci-mathematics/glpk-4.63
index a11fdaf180bf..f2ba8072f5f9 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-4.63
+++ b/metadata/md5-cache/sci-mathematics/glpk-4.63
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0
 SLOT=0/40
 SRC_URI=mirror://gnu/glpk/glpk-4.63.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f46cbc233d1f6dc30e421bacb389d8f2
+_md5_=5124325f96d7bbb6d4d41fcf62df777c
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2018 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2018
new file mode 100644
index 000000000000..f34fc9b33c17
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2018
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.02.3[ocamlopt?] dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith ) zip? ( >=dev-ml/camlzip-1.07 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Platform for deductive program verification
+EAPI=6
+HOMEPAGE=http://why3.lri.fr/
+IUSE=coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/ocaml-4.02.3[ocamlopt?] dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith ) zip? ( >=dev-ml/camlzip-1.07 )
+REQUIRED_USE=html? ( doc )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a43 -> why3-for-spark-gpl-2018-src.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3942682441423242e44253f795765a9d
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index ac1aad47a86d..e1aa17de554e 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2
deleted file mode 100644
index 6cfb4eb50eac..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3
deleted file mode 100644
index f402559e9cf4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for abrt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=eccb9a4d6cee6691dadd10cb5603e3ef
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1
index c7672e574d8d..bc49cbf0efb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b32d2b78f6132c11c872970dc3f88420
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2
index 38427964255d..c845ef987fe6 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b32d2b78f6132c11c872970dc3f88420
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3
index b4d7b0451f12..88877e721981 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c9b6d889b30341995eba6be1c804a4b8
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180701-r1
new file mode 100644
index 000000000000..a33d4fcec05e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for abrt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c9b6d889b30341995eba6be1c804a4b8
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-9999 b/metadata/md5-cache/sec-policy/selinux-abrt-9999
index 950d1eac9cc2..bc61c6569669 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c9b6d889b30341995eba6be1c804a4b8
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2
deleted file mode 100644
index 5742953714cf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3
deleted file mode 100644
index 9606b49d9c07..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for accountsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=68067037c8278f4f44923fb25f84397a
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1
index b3a75ebb5743..fa8d2179036f 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ca21bdd547ee5ada8b474b430afb4c2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2
index 4baa8783cf1c..0ca6b82630d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ca21bdd547ee5ada8b474b430afb4c2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3
index 31db5eaf4fbe..061de9839903 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aac6aff598a6428960f93798b7c604d2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180701-r1
new file mode 100644
index 000000000000..9ee71cd5a0a2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for accountsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=aac6aff598a6428960f93798b7c604d2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-9999 b/metadata/md5-cache/sec-policy/selinux-accountsd-9999
index 7cfed63c8016..17fa9fb2e0ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aac6aff598a6428960f93798b7c604d2
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2
deleted file mode 100644
index 8fe97aa32282..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3
deleted file mode 100644
index 432ea17ac3f5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=75a7db9874bf5dc9cfe357361569f8ae
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1
index fe99178fd413..15cae906d1ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=433cf64df5c17c2619eabe672020d603
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2
index 4657ec85df2d..186349afecb0 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=433cf64df5c17c2619eabe672020d603
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3
index 638a7887c7cd..3be7109aec4a 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b3bb8870357316b44bcbce46eca05114
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-acct-2.20180701-r1
new file mode 100644
index 000000000000..4954ad3de813
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for acct
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b3bb8870357316b44bcbce46eca05114
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-9999 b/metadata/md5-cache/sec-policy/selinux-acct-9999
index 01df40b00cc8..727fe4dc6c7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-acct-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b3bb8870357316b44bcbce46eca05114
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2
deleted file mode 100644
index 206d9fb04b49..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3
deleted file mode 100644
index ba0b4178f8c2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ada
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=020c85651c629f65f072dcf008e23cce
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1
index 7f81e807368a..6710362adaa5 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0235f86ca6ff93c2087925c74239203a
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2
index 55e78379e3c3..fcd14c29382b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0235f86ca6ff93c2087925c74239203a
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3
index 5d624c8dce9e..0f12acc5aabb 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25fe9e2b2fb73b1edf6631159d0c846d
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ada-2.20180701-r1
new file mode 100644
index 000000000000..66b818db31f9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ada-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ada
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=25fe9e2b2fb73b1edf6631159d0c846d
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-9999 b/metadata/md5-cache/sec-policy/selinux-ada-9999
index ff0a8807d049..876cf09f3935 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ada-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25fe9e2b2fb73b1edf6631159d0c846d
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2
deleted file mode 100644
index a3e74f4735d6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3
deleted file mode 100644
index 3b7257b017d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for afs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=31dcb8619e4493917cbb49741363752b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1
index 83a309c0e59a..eeb43f81b3c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e6290f7e7086c0b9aad8cce7f21b6536
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2
index ffe24508c341..c063d650a7f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e6290f7e7086c0b9aad8cce7f21b6536
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3
index abf3007b1e98..378808732315 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29c34d5da8168c34ab966d05165b8e0b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-afs-2.20180701-r1
new file mode 100644
index 000000000000..2a3e4592ccb6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for afs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=29c34d5da8168c34ab966d05165b8e0b
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-9999 b/metadata/md5-cache/sec-policy/selinux-afs-9999
index d03b22960bcc..f565082d1e5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-afs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29c34d5da8168c34ab966d05165b8e0b
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2
deleted file mode 100644
index 4063d7538b82..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3
deleted file mode 100644
index c0bbe4372072..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for aide
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8184619c670badca20be906c0c653f55
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1
index 51621c59af46..7e8fcda233c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a1bc79b92c1cc4b9a0670c9f41dc5016
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2
index 700487d051d8..02086ea32beb 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a1bc79b92c1cc4b9a0670c9f41dc5016
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3
index 2ac202b0a773..d5a988e7ea53 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=548f200303bedea66e857e013d2fb067
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-aide-2.20180701-r1
new file mode 100644
index 000000000000..a9b3a968ba98
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for aide
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=548f200303bedea66e857e013d2fb067
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-9999 b/metadata/md5-cache/sec-policy/selinux-aide-9999
index 51126ccb72d2..c386977e154d 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-9999
+++ b/metadata/md5-cache/sec-policy/selinux-aide-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=548f200303bedea66e857e013d2fb067
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2
deleted file mode 100644
index 2972588b127c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3
deleted file mode 100644
index 618870051896..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for alsa
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fee12ed6cf0f127a0c8ed85e2391fde7
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1
index 3f5c676871d5..e3de5c2fb86e 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b33d94abbfc16d87de3fe0ab0f593ff4
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2
index e677c4591e4c..fbab1024ad1a 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b33d94abbfc16d87de3fe0ab0f593ff4
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3
index a8aa50a56c2a..64ffe2001005 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b351f22af25989728c9450c85b0dceaa
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180701-r1
new file mode 100644
index 000000000000..40da3da166f3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for alsa
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b351f22af25989728c9450c85b0dceaa
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-9999 b/metadata/md5-cache/sec-policy/selinux-alsa-9999
index 1c7aa1162fce..137e1705ccc0 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-9999
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b351f22af25989728c9450c85b0dceaa
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2
deleted file mode 100644
index 939a3978190e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3
deleted file mode 100644
index bd166f1dc8ed..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amanda
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cd2912c5bfd0bd1aa4c3649d1ffc446e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1
index b0d184b2ea67..b1b7e3b7a482 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fdcbbc2f138b69e75c0ed0abca6c6dd1
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2
index 6ab46ebd1ebf..457b4a9dbabc 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fdcbbc2f138b69e75c0ed0abca6c6dd1
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3
index 9e807380e96b..4f424d57485e 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6f7db71314c55a0cb296245a7d1f424e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180701-r1
new file mode 100644
index 000000000000..14efea7bdd90
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for amanda
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6f7db71314c55a0cb296245a7d1f424e
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-9999 b/metadata/md5-cache/sec-policy/selinux-amanda-9999
index 16ad0283ef9b..5fefdd614653 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6f7db71314c55a0cb296245a7d1f424e
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2
deleted file mode 100644
index 6bac10087b65..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3
deleted file mode 100644
index e0fd977f997a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for amavis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d5d5ddc511e2bd8bbc93fd0273286a7f
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1
index 18e964943040..dbb637ac6411 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3d77dee1dfbbec73730a91f9bc775096
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2
index 8d2adb6b8165..35905f5f13f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3d77dee1dfbbec73730a91f9bc775096
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3
index 3ec5909e0598..7575cc3b0a56 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f7059b7d970603a5fd937b27f96f1d4d
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180701-r1
new file mode 100644
index 000000000000..da9a2f33df9f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for amavis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f7059b7d970603a5fd937b27f96f1d4d
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-9999 b/metadata/md5-cache/sec-policy/selinux-amavis-9999
index 5fa1582842c5..43811ef9b0ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f7059b7d970603a5fd937b27f96f1d4d
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2
deleted file mode 100644
index 699681e96c7e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3
deleted file mode 100644
index 8bfdce9d7ec1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for android
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5152b0fee09e462a5e16de2387644b4b
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1
index 8cb0e99c4883..840c04446dcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4f872b9506a7a33b4e77b05a7b0b610e
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2
index 851a8b602e16..11f6c2588e25 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4f872b9506a7a33b4e77b05a7b0b610e
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3
index 5a457249711d..930cc0bf6e42 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2d294c6f0a5a92cd7d96ac7746f47d2d
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-android-2.20180701-r1
new file mode 100644
index 000000000000..8c08d3b620b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for android
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2d294c6f0a5a92cd7d96ac7746f47d2d
diff --git a/metadata/md5-cache/sec-policy/selinux-android-9999 b/metadata/md5-cache/sec-policy/selinux-android-9999
index a31332216c9c..bc81a93895a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-9999
+++ b/metadata/md5-cache/sec-policy/selinux-android-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2d294c6f0a5a92cd7d96ac7746f47d2d
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2
deleted file mode 100644
index b9c9bbfe0673..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3
deleted file mode 100644
index 271a912159f3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apache
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c45ffd150ac0c5f580dc3475cc98b294
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1
index c03c135cc97a..71fa49876ba9 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=30f3c100de98a26fa9a7523fdcc81148
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2
index c03893341375..245d04464c44 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=30f3c100de98a26fa9a7523fdcc81148
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3
index 742a10126ad7..859ac228fd95 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48b4126b0df72dc981f8a5364fd7846c
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20180701-r1
new file mode 100644
index 000000000000..f3f6d59f1b41
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apache
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=48b4126b0df72dc981f8a5364fd7846c
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-9999 b/metadata/md5-cache/sec-policy/selinux-apache-9999
index 2e812ce6e7ee..fdcaec65006a 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apache-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48b4126b0df72dc981f8a5364fd7846c
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2
deleted file mode 100644
index 7858bc863ca4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3
deleted file mode 100644
index 71d181b682d3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for apcupsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4c392ce2c96ebddef76a524456f78ebf
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1
index cd00b8ab7d22..1c9c48ee2a6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=59b19adaca883f8c7d74dabcf0b77954
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2
index d3b8919e3ba0..de64ec8cc816 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=59b19adaca883f8c7d74dabcf0b77954
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3
index 62e54ecae55c..857f5aab1fbb 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d676814bfbfdf1eef411fee37afde19e
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180701-r1
new file mode 100644
index 000000000000..f5c715e09acf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for apcupsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d676814bfbfdf1eef411fee37afde19e
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999 b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
index 1b4ee480bfaf..83decbf87940 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d676814bfbfdf1eef411fee37afde19e
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2
deleted file mode 100644
index 7e8c5e75e250..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acpi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7301ffe3c7df3bcc0deea1417eaa6cce
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3
deleted file mode 100644
index 21439de764a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for acpi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7301ffe3c7df3bcc0deea1417eaa6cce
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1
index 52fad723be12..341ffabbee81 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=58a6c97395120cc27e65dc7f95942afe
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2
index 6dfda749ceab..45608d7f45a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=58a6c97395120cc27e65dc7f95942afe
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3
index c2900f0d2fef..6c0694dad99f 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0972244da4acefa37d77a271256e6b74
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-apm-2.20180701-r1
new file mode 100644
index 000000000000..6cfc31e0a3f0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for acpi
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0972244da4acefa37d77a271256e6b74
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-9999 b/metadata/md5-cache/sec-policy/selinux-apm-9999
index 4963fdfe1f8d..fa8ccf37b6c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0972244da4acefa37d77a271256e6b74
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2
deleted file mode 100644
index 1fc78be76a38..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3
deleted file mode 100644
index 63f8cd4ea68e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for arpwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=440b9a4eb2484df11a70f14a7b4eac2f
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1
index a2f1e88bd989..671491bb59c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=26e167f5aaaa71f4e98cff47fb763414
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2
index 48220179d0d6..dae575c5e868 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=26e167f5aaaa71f4e98cff47fb763414
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3
index 49985b4a6c0f..c34b4a6a0c6c 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=46aaccaf3b7e46d22ec5ba86ec1dd4a0
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180701-r1
new file mode 100644
index 000000000000..8cfa69d5272b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for arpwatch
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=46aaccaf3b7e46d22ec5ba86ec1dd4a0
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999 b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
index fd6053e48e2b..f14c2edcf261 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=46aaccaf3b7e46d22ec5ba86ec1dd4a0
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2
deleted file mode 100644
index 240359ec264d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3
deleted file mode 100644
index ea3fb554b76b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for asterisk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cfec5879b0bf2dbfc4f298eaba151c11
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1
index 067e97306e03..1c4567419103 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0bb200fb53be5f5bf35c6066be222b38
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2
index d18099363025..53b3597afdd2 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0bb200fb53be5f5bf35c6066be222b38
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3
index e09c7db7f6ea..96dbdf2147cc 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=27f1376aafa58b1565261f9e43bbd345
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180701-r1
new file mode 100644
index 000000000000..ccd194a273ae
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for asterisk
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=27f1376aafa58b1565261f9e43bbd345
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-9999 b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
index b1ce67109ea3..bd48bc3c943b 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=27f1376aafa58b1565261f9e43bbd345
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2
deleted file mode 100644
index df9dd2377c7a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3
deleted file mode 100644
index 716e3a754976..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for at
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b2e1d7caeacef680ba2434e78a094490
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1
index 27e38e59e794..9362e715b886 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a78e86d63bcf6b974699df4aee14e77e
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2
index ee6c6ab98771..6181d77ac485 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a78e86d63bcf6b974699df4aee14e77e
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3
index a0101c571546..1a0c7600dfe2 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a74095393e04e926bf07e7e46b33c5ce
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-at-2.20180701-r1
new file mode 100644
index 000000000000..d67f4c1a6051
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for at
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a74095393e04e926bf07e7e46b33c5ce
diff --git a/metadata/md5-cache/sec-policy/selinux-at-9999 b/metadata/md5-cache/sec-policy/selinux-at-9999
index 38633a4463db..66df01739f13 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-9999
+++ b/metadata/md5-cache/sec-policy/selinux-at-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a74095393e04e926bf07e7e46b33c5ce
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2
deleted file mode 100644
index 3b1a7dd18f8d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3
deleted file mode 100644
index c65b1d6f9f96..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for automount
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ae52002a8018cf6e89235547775b1399
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1
index db8955c8174b..27f6e6bda202 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3833cacbceee40c672c4cb8650ca2d6
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2
index 8c4e6767d4a1..6f88ff49c3c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3833cacbceee40c672c4cb8650ca2d6
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3
index 30e36d4be38a..d5f883cdc7b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c90750f7be87598be3911381e431df7c
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-automount-2.20180701-r1
new file mode 100644
index 000000000000..f172cee2fead
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for automount
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c90750f7be87598be3911381e431df7c
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-9999 b/metadata/md5-cache/sec-policy/selinux-automount-9999
index 6247f1d2420e..0f438f613c46 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-9999
+++ b/metadata/md5-cache/sec-policy/selinux-automount-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c90750f7be87598be3911381e431df7c
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2
deleted file mode 100644
index c2f52906c806..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3
deleted file mode 100644
index 51e2c6a45658..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for avahi
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e131fb429de95dd314c310e4326c3889
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1
index e4d26c06bb97..d14869493f3f 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5b30a5a9373d384f92c0e66747ec0820
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2
index f8de873cbb5e..be1efc309cad 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5b30a5a9373d384f92c0e66747ec0820
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3
index 514e8bab551d..78f426fbb00f 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=973de877a6b33934c0878bc6f0c1107f
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180701-r1
new file mode 100644
index 000000000000..fe62b5282bc0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for avahi
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=973de877a6b33934c0878bc6f0c1107f
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-9999 b/metadata/md5-cache/sec-policy/selinux-avahi-9999
index fa263be799c9..bd4056fdcd6a 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=973de877a6b33934c0878bc6f0c1107f
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2
deleted file mode 100644
index 26b3ae043dee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3
deleted file mode 100644
index e96e45a6fbe0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for awstats
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f26836c42e671890aaa9921a902aca3a
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1
index 6c4ba01b7c97..499cd4cb8ed8 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7ffe511de95de1af4f247af28f981fe2
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2
index 850ce22fa9c0..16fa61132e4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7ffe511de95de1af4f247af28f981fe2
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3
index 6fde5ac3082a..d10a93a5bc27 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1856d797f9d145635e0233819079d917
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180701-r1
new file mode 100644
index 000000000000..67321d2cc86f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for awstats
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1856d797f9d145635e0233819079d917
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-9999 b/metadata/md5-cache/sec-policy/selinux-awstats-9999
index 47542f72a8d3..caf9210a77d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-9999
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1856d797f9d145635e0233819079d917
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2
deleted file mode 100644
index 5da0b8d7ece4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3
deleted file mode 100644
index 17c959ff3632..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for generic backup apps
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=51ad2598f3ae2103dc028922cff61277
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1
index 67e4d4594eb9..f2ae913bf447 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=70dece5011be318b1c6ee04936a34838
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2
index cf162da79a65..725844cd2bfb 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=70dece5011be318b1c6ee04936a34838
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3
index e6b03f40381c..e470ac4be186 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3bb466ad28f1e20fc3f3e87bd664f508
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-backup-2.20180701-r1
new file mode 100644
index 000000000000..926d73661d7f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for generic backup apps
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3bb466ad28f1e20fc3f3e87bd664f508
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-9999 b/metadata/md5-cache/sec-policy/selinux-backup-9999
index 44383097fcd5..15614a52d106 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-backup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3bb466ad28f1e20fc3f3e87bd664f508
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2
deleted file mode 100644
index b9fb222c52d4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3
deleted file mode 100644
index 093e42c12e3b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bacula
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a09c785b6b1eef505a9c793d0983cda8
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1
index 8c7a2f467626..ed6566bb78e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7209213498b279bf05c98231308b6735
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2
index 16ec302bf327..43e99cc679e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7209213498b279bf05c98231308b6735
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3
index 0f242478dfc3..6402691095f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ec36167210d970a8bce0bbfac92b88f
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180701-r1
new file mode 100644
index 000000000000..b468e9016c28
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bacula
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2ec36167210d970a8bce0bbfac92b88f
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-9999 b/metadata/md5-cache/sec-policy/selinux-bacula-9999
index 974fc3754ae0..787056e5a242 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ec36167210d970a8bce0bbfac92b88f
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r2
deleted file mode 100644
index 40b3b9b82344..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_md5_=a516a58f2a6f63ec1619d2882e502699
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r3
deleted file mode 100644
index 80b7775c521c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.3
-DESCRIPTION=Gentoo base policy for SELinux
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.3 virtual/udev
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_md5_=a516a58f2a6f63ec1619d2882e502699
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-base-2.20180701-r1
new file mode 100644
index 000000000000..d95917a138f2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-base-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=sys-apps/policycoreutils-2.8 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.8
+DESCRIPTION=Gentoo base policy for SELinux
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.8 virtual/udev
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_md5_=2fc724b9e2781b1ce6541d1eb4045c0a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-9999 b/metadata/md5-cache/sec-policy/selinux-base-9999
index 99ea2b568080..84cfe9221791 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.7 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.7 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-apps/policycoreutils-2.8 virtual/udev sys-devel/m4 >=sys-apps/checkpolicy-2.8 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Gentoo base policy for SELinux
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=doc +open_perms +peer_perms systemd +ubac +unconfined
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.7 virtual/udev
+RDEPEND=>=sys-apps/policycoreutils-2.8 virtual/udev
 SLOT=0
 _eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=5d5c9667f836f85f655074a21bb8af6a
+_md5_=2fc724b9e2781b1ce6541d1eb4045c0a
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r2
deleted file mode 100644
index e57b845e62dc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170805-r2[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_md5_=bcfa22d4c98af5b9a07d309091d623a3
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r3
deleted file mode 100644
index 069356c577eb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND==sec-policy/selinux-base-2.20170805-r3[systemd?]
-DESCRIPTION=SELinux policy for core modules
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=systemd +unconfined
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_md5_=bcfa22d4c98af5b9a07d309091d623a3
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180701-r1
new file mode 100644
index 000000000000..c834290c4ebb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare pretend setup
+DEPEND==sec-policy/selinux-base-2.20180701-r1[systemd?]
+DESCRIPTION=SELinux policy for core modules
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=systemd +unconfined
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
+RDEPEND==sec-policy/selinux-base-2.20180701-r1[systemd?]
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_md5_=7688f06aed35449389306321a093b424
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-9999 b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
index e152d26d9518..6a5310cbfa54 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
@@ -9,4 +9,4 @@ PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
 RDEPEND==sec-policy/selinux-base-9999[systemd?]
 SLOT=0
 _eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=ec3c456181d6588001a7d82ac223c6c8
+_md5_=7688f06aed35449389306321a093b424
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2
deleted file mode 100644
index 0bc930f55745..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3
deleted file mode 100644
index 566468f9bcf5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a67c60cd4460a559747d96be07c47a20
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1
index 4bdce6cc70fd..cd7e5483a1ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=82db06962ab4c11d3ee47aff15692e00
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2
index 10dc6ca03f45..99c9d4720f7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=82db06962ab4c11d3ee47aff15692e00
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3
index 5abf8cb2c69a..9263d9e0ad4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=56ca81f2e52d34e990a86a9a18d5d7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-bind-2.20180701-r1
new file mode 100644
index 000000000000..a962a1e56734
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bind
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=56ca81f2e52d34e990a86a9a18d5d7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-9999 b/metadata/md5-cache/sec-policy/selinux-bind-9999
index 08421e18b21f..dfb981603c86 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bind-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=56ca81f2e52d34e990a86a9a18d5d7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2
deleted file mode 100644
index d8f1f94e8e12..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3
deleted file mode 100644
index bbdaa905d8d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitcoin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d8961c3044b30cb12571fd05d2e8df32
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1
index 3511981ac051..956853f7f5e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5dc314ff55eb3cc52c911df1e443e5f1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2
index 08c7f9ffac4f..fb842e9867d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5dc314ff55eb3cc52c911df1e443e5f1
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3
index dbb7205bf199..eb403267f356 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c96736a007cbcb61ef48e7e04a194fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180701-r1
new file mode 100644
index 000000000000..3f155b2d5656
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bitcoin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c96736a007cbcb61ef48e7e04a194fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-9999 b/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
index dc67f0b6e3fc..f0bb517186a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c96736a007cbcb61ef48e7e04a194fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2
deleted file mode 100644
index 55e1a61a41d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3
deleted file mode 100644
index a020b9ba1e5f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bitlbee
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=408057c025876c3b3692f831077a8dd9
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1
index 093e4d685e89..9ca707e15bee 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9dbf55178fc2f3e6b4cbfeeb193fe882
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2
index 5f840c37e06e..d71bd7bd6a4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9dbf55178fc2f3e6b4cbfeeb193fe882
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3
index 899afb39339f..fbcd0c4ef67b 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=229d5b182553dcc9c914553b07270431
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180701-r1
new file mode 100644
index 000000000000..5dd278befe14
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bitlbee
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=229d5b182553dcc9c914553b07270431
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999 b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
index 3faad3d7d42b..a5c55997f19d 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=229d5b182553dcc9c914553b07270431
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2
deleted file mode 100644
index a5bc81adbdb7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3
deleted file mode 100644
index 987cd04576f0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for bluetooth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=03a3820b224288d4643b1d47fe0fba47
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1
index 20e1d0018d75..49b771f56b33 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9cf9317b38aa4ad14d4f99a91d376b25
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2
index 2d30083d2600..894f93b99bed 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9cf9317b38aa4ad14d4f99a91d376b25
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3
index 7076f89f3733..b5e14a6c10a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=673558fcfd0a3b72c9c45d8d11d7a949
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180701-r1
new file mode 100644
index 000000000000..774ca761cc50
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for bluetooth
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=673558fcfd0a3b72c9c45d8d11d7a949
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999 b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
index a2f7487bc590..1fa5dc850c85 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=673558fcfd0a3b72c9c45d8d11d7a949
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2
deleted file mode 100644
index fad1d1793391..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3
deleted file mode 100644
index d6d84e12049f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for brctl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=06bb460617bae94d3547480331dc732d
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1
index bcea9d21b917..742da90f9232 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8a25d670116c4d785b75800523d2e916
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2
index 2924c2303d5a..8cfef7e528c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8a25d670116c4d785b75800523d2e916
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3
index 0f8ea512d1db..a7f91541e60f 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=92d641643aab6f44f1a1f8ed004ca1e5
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180701-r1
new file mode 100644
index 000000000000..9bfe420b2e56
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for brctl
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=92d641643aab6f44f1a1f8ed004ca1e5
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-9999 b/metadata/md5-cache/sec-policy/selinux-brctl-9999
index 52ddd6e6f358..700933eb12d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=92d641643aab6f44f1a1f8ed004ca1e5
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2
deleted file mode 100644
index 818542865b67..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3
deleted file mode 100644
index c1ae31c172e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cachefilesd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=01abe3d2507c2c53faefc8549b240376
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1
index 67e121c38fa3..848d48662ef6 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ca7bdc63fbf7686c930e9735a4d56cdc
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2
index c28bb06aa92c..00ce324ec913 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ca7bdc63fbf7686c930e9735a4d56cdc
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3
index d51fd09a9e49..09f2d290a9ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d1b26738e3edb719175126355d608017
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180701-r1
new file mode 100644
index 000000000000..4c27176a66ac
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cachefilesd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d1b26738e3edb719175126355d608017
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
index 5661655fb232..f2ec9c7ba9c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d1b26738e3edb719175126355d608017
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2
deleted file mode 100644
index f0efd1dbcdb6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3
deleted file mode 100644
index 781284f6aac0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for calamaris
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7f47e54dc9221025b76a6dcb17128e92
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1
index 6a16dac67e5b..c10dddab3686 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a0e6633fc25dd1b42ef5d909db8ef295
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2
index fdeddaf39fef..3570910c77a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a0e6633fc25dd1b42ef5d909db8ef295
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3
index e6e283039354..4e6d2b7a3a3e 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=043088fe9b8d2927d9c328d3384b0c40
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180701-r1
new file mode 100644
index 000000000000..9144fa47f792
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for calamaris
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=043088fe9b8d2927d9c328d3384b0c40
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-9999 b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
index 8456ad13919d..98315c4c4c2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-9999
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=043088fe9b8d2927d9c328d3384b0c40
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2
deleted file mode 100644
index a7ee78910656..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3
deleted file mode 100644
index 4e211c4f63ad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for canna
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c46e582668f237b257d47405c02b43fd
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1
index 10b6d9d357e6..6c0cedb6d42c 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4509fcea12c807629014769696d19cd9
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2
index 9607219ca569..0200db48f3ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4509fcea12c807629014769696d19cd9
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3
index b782f08e166e..9732746075bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fb000b799f6f4c1e62e20ae2797df7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-canna-2.20180701-r1
new file mode 100644
index 000000000000..5547aafbed9d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for canna
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=fb000b799f6f4c1e62e20ae2797df7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-9999 b/metadata/md5-cache/sec-policy/selinux-canna-9999
index c96312a28a00..b41c879e40ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-9999
+++ b/metadata/md5-cache/sec-policy/selinux-canna-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fb000b799f6f4c1e62e20ae2797df7ef
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2
deleted file mode 100644
index 10f1f9069374..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3
deleted file mode 100644
index 8d706cdcfa5a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ccs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a862f3fdb0ad27458ec79244c7a5643f
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1
index 1bd89afe7610..c6f3bc6692b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=234de119aa34f40a900e85145b761aac
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2
index 1460e58d453e..dfa934465ac6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=234de119aa34f40a900e85145b761aac
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3
index b666487e4157..581d96a11766 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5cb2fe604adfebbcff489cc2eaa0f87b
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180701-r1
new file mode 100644
index 000000000000..d2d52e16ab6a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ccs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=5cb2fe604adfebbcff489cc2eaa0f87b
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-9999 b/metadata/md5-cache/sec-policy/selinux-ccs-9999
index 75d10c7f6b89..9a3d2d00d354 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5cb2fe604adfebbcff489cc2eaa0f87b
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2
deleted file mode 100644
index c1c95e84be84..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3
deleted file mode 100644
index 0e519cbbeb25..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cdrecord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f0a88a3f11286fa4e127fca0df2152db
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1
index d8f29eb17aa0..d8e734523b31 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4ac2190bf09c73a89d25a46b5f10650
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2
index a8457232481a..bad4b9ef80cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4ac2190bf09c73a89d25a46b5f10650
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3
index 5062d5e22e44..d3a6c57d07ac 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7210013d3ec91eb6074ec6bc197325a9
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180701-r1
new file mode 100644
index 000000000000..3827a3a3bf6f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cdrecord
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=7210013d3ec91eb6074ec6bc197325a9
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999 b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
index 104dd1788484..e9bb8252af31 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7210013d3ec91eb6074ec6bc197325a9
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2
deleted file mode 100644
index 61bd4cbce2a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3
deleted file mode 100644
index a4ae52294e1e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ceph
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0ecc842dc5d7c9df1d861923578bf81d
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1
index 6010ed0cc3b2..dd0db2321901 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=358773d7e49e8fe232d4845b9445b916
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2
index a38a68480723..eecdda0ed56a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=358773d7e49e8fe232d4845b9445b916
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3
index 5cd8a2852fef..b99d1274b102 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e7184c33d1b867efb62f93304e8bd6b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180701-r1
new file mode 100644
index 000000000000..c8a167e54309
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ceph
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e7184c33d1b867efb62f93304e8bd6b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-9999 b/metadata/md5-cache/sec-policy/selinux-ceph-9999
index b179bd1ef9c2..e0a1943a3145 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e7184c33d1b867efb62f93304e8bd6b0
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2
deleted file mode 100644
index ae59197cedbd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3
deleted file mode 100644
index 5cd45a5fe0c9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=44fd88c97f05d1bc1e5572ac78025f83
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1
index b0a6f7781cae..b8bd62c5f136 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0f4dbc0f949ddb7543b8471ed38b1d27
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2
index 64c3302b44e3..c75417b9f803 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0f4dbc0f949ddb7543b8471ed38b1d27
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3
index 1915bf03f75f..a556c22da788 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2f959b3a8442ae8f6d38619a18851d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180701-r1
new file mode 100644
index 000000000000..ebc40a368b4b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cgmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2f959b3a8442ae8f6d38619a18851d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
index 857edd364af0..def45ed7a2b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2f959b3a8442ae8f6d38619a18851d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2
deleted file mode 100644
index fb5160e578b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3
deleted file mode 100644
index 3728b4bb0661..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cgroup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d4a2cb48d0b407a80ad5bc17747a0e7a
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1
index 4b788b71e7bd..07bb9e922c72 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0eec56d7da43ac546e14af46af296970
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2
index 60ed54326454..2f1aaf67d4a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0eec56d7da43ac546e14af46af296970
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3
index 17c06025bbb3..903f261b2a99 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6a3f172227d14106b8ba5419274cb7e0
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180701-r1
new file mode 100644
index 000000000000..4286ed295acf
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cgroup
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6a3f172227d14106b8ba5419274cb7e0
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-9999 b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
index 76f6ede1118e..ffc97bee1123 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6a3f172227d14106b8ba5419274cb7e0
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2
deleted file mode 100644
index 067a0e628910..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3
deleted file mode 100644
index 9bb3276fade9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20170805-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chromium
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f5b806028121e1200e759e89f08c0a91
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1
index 8be8b7ecba4c..5d1c6d50d874 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ae467b1e75b7b1f70680c14fc5a57ad5
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2
index 2b9a1f854ab7..57b210052c32 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ae467b1e75b7b1f70680c14fc5a57ad5
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3
index d36f8ffc8034..e715af4af256 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180114-r3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d831bee44baa51613d09e3c5d934dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180701-r1
new file mode 100644
index 000000000000..9bf0b888d2b2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for chromium
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d831bee44baa51613d09e3c5d934dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-9999 b/metadata/md5-cache/sec-policy/selinux-chromium-9999
index 54fde46cdf8a..93d8fbef6c31 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d831bee44baa51613d09e3c5d934dc1a
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2
deleted file mode 100644
index 3f5307a5e230..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3
deleted file mode 100644
index 8490742a4ed6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for chronyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a730b182839d29856cc1d239f496c25e
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1
index 7d1912fa392a..2bcfa143a02a 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cd9637b367aad9f7a65e0519f9275141
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2
index 4852bbf20e9e..2e781b1d2b12 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cd9637b367aad9f7a65e0519f9275141
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3
index 57d2c5a38f86..b892e5a28ef0 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d86f3bf2a78c99d43a7929ff511b49d6
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180701-r1
new file mode 100644
index 000000000000..f8db990390c9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for chronyd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d86f3bf2a78c99d43a7929ff511b49d6
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-9999 b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
index 49e298f09a1c..1109fb6ac7ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d86f3bf2a78c99d43a7929ff511b49d6
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2
deleted file mode 100644
index fb3bb2d91fa6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3
deleted file mode 100644
index 258a799fbde2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clamav
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d33014abded666b71fba97be4ab3129b
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1
index 0409ce4cca6f..7f61a0cff858 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b52ffdf9b1c0a8cc74c4b9246e66b72
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2
index 483ba54d536e..6ceea64ada34 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b52ffdf9b1c0a8cc74c4b9246e66b72
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3
index ff9eba4c1327..f80bb71bda03 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b51f8750ca8b19c12ae980ea99b09d1e
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180701-r1
new file mode 100644
index 000000000000..e02804bb4d3b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for clamav
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b51f8750ca8b19c12ae980ea99b09d1e
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-9999 b/metadata/md5-cache/sec-policy/selinux-clamav-9999
index 42b175af99ab..da5276ffb4b4 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b51f8750ca8b19c12ae980ea99b09d1e
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2
deleted file mode 100644
index 6f8487d5aa76..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3
deleted file mode 100644
index 9c38890cf5c8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for clockspeed
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bafc5e7719da48a03588e79826b13238
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1
index d03ef56fef74..8b4a216ee715 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4fd9944a753ac4d37f9a005bfb87d345
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2
index 88b3f2ad7532..4a8fa77f7c96 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4fd9944a753ac4d37f9a005bfb87d345
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3
index f0633a01f018..fdeaed0f2154 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2b402a30d9fb5f9d8bd0ed03b1b0568
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180701-r1
new file mode 100644
index 000000000000..485e25213f55
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for clockspeed
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c2b402a30d9fb5f9d8bd0ed03b1b0568
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999 b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
index ee210433cb3e..b69877c3fe6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2b402a30d9fb5f9d8bd0ed03b1b0568
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2
deleted file mode 100644
index 369f7aceaed9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3
deleted file mode 100644
index b431b29d9382..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for collectd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=169eda9ab17e8fb922178c90361b6896
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1
index 19021747870b..b9e9f4e1838b 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=13ea83fce42eb8ff4834d83006893c1a
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2
index 6a5193292892..5eb04d2602d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=13ea83fce42eb8ff4834d83006893c1a
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3
index 96480892396d..95cb990bd650 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f5b66d8894949bf0781834660ca83f28
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180701-r1
new file mode 100644
index 000000000000..b39ca0443390
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for collectd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f5b66d8894949bf0781834660ca83f28
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-9999 b/metadata/md5-cache/sec-policy/selinux-collectd-9999
index 963f6d7a8cdc..297526887545 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f5b66d8894949bf0781834660ca83f28
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2
deleted file mode 100644
index 154e19ac2012..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3
deleted file mode 100644
index 2f4160b12282..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for consolekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a0c4e9456c5fa99f5f9f238e7e02e889
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1
index ed55fbf0b6fe..0ee17bd1ab65 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2f362248fdc6005989115ce8e54f4697
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2
index 0e8199617893..acc4cb294c66 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2f362248fdc6005989115ce8e54f4697
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3
index 9fe0052139c3..b549d16260a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=eba1ea8502b23a7b9cc10ca49bc66fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180701-r1
new file mode 100644
index 000000000000..3743597a6255
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for consolekit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=eba1ea8502b23a7b9cc10ca49bc66fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-9999 b/metadata/md5-cache/sec-policy/selinux-consolekit-9999
index 5a5054b00c8f..095bc59c423e 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=eba1ea8502b23a7b9cc10ca49bc66fe0
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2
deleted file mode 100644
index e354e9d2e312..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3
deleted file mode 100644
index 9e9eb811fa80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for corosync
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=23c0672cb0e209bf899cda58295a26d6
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1
index 18bf414deb19..edfe960f74b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2336c28c79721939be55a8a7e1a7170
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2
index 5aecaf2134cb..390125e2339d 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2336c28c79721939be55a8a7e1a7170
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3
index 8b0998c7fdda..9493e6223828 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a9b2631f1f6282c9998acbd77cd95616
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180701-r1
new file mode 100644
index 000000000000..1b0fbd2ca865
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for corosync
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a9b2631f1f6282c9998acbd77cd95616
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-9999 b/metadata/md5-cache/sec-policy/selinux-corosync-9999
index 63d5e3fcb40e..d646d34fd69c 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-9999
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a9b2631f1f6282c9998acbd77cd95616
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2
deleted file mode 100644
index 0340e4bcf4aa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3
deleted file mode 100644
index d3ec1fc967a7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for couchdb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3ad1e1bd8c49b0128cd068413e0e4fcf
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1
index 082ab4de22ae..a9ea6fd684e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=76491dca02be51639f903f2a1639186c
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2
index 5042cc875f40..a789075dc302 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=76491dca02be51639f903f2a1639186c
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3
index d79d817d36ed..0ea463df916b 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6bdb0e08cf91e268994b2481a2ea79ab
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180701-r1
new file mode 100644
index 000000000000..3eeb893c63df
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for couchdb
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6bdb0e08cf91e268994b2481a2ea79ab
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-9999 b/metadata/md5-cache/sec-policy/selinux-couchdb-9999
index 1caf5ecd6df7..2584af325a2f 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-9999
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6bdb0e08cf91e268994b2481a2ea79ab
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2
deleted file mode 100644
index 4b2e52af4b9e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3
deleted file mode 100644
index cf5a47a2f243..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for courier
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ff29334da0263ed29cae52b1f20cf647
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1
index 845bbed55785..c00579a688c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2c3785ca7752158349712a551d15f5e2
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2
index 17c1af5bc5c3..8d0461ac3157 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2c3785ca7752158349712a551d15f5e2
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3
index 99722e708dbf..0eb6730f9e34 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cc8c57b9c7bc73f2871bbfb1cacd3cdd
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-courier-2.20180701-r1
new file mode 100644
index 000000000000..b3ec3334b156
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for courier
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=cc8c57b9c7bc73f2871bbfb1cacd3cdd
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-9999 b/metadata/md5-cache/sec-policy/selinux-courier-9999
index ab5cb40ffd20..48f9b0526709 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-9999
+++ b/metadata/md5-cache/sec-policy/selinux-courier-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cc8c57b9c7bc73f2871bbfb1cacd3cdd
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2
deleted file mode 100644
index 715625ccf3a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3
deleted file mode 100644
index 6956a6848d66..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpucontrol
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a7310120c1f2d25a937a886ad7f3994b
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1
index f4404924f4e9..aa1dda4430c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a0aa980b0e837d4c3d1f9892d66e840e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2
index 0e796f47d557..312179969bc0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a0aa980b0e837d4c3d1f9892d66e840e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3
index a5d4c3d44ef1..6b9e44238246 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bac3a81d604cd6678b66faf2edd61534
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180701-r1
new file mode 100644
index 000000000000..9fc4e738b75c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cpucontrol
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=bac3a81d604cd6678b66faf2edd61534
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
index 519424127412..0537ca9198de 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bac3a81d604cd6678b66faf2edd61534
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2
deleted file mode 100644
index 19da7e16e5c1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3
deleted file mode 100644
index 5587537b4ac0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cpufreqselector
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a8cb82bf6edf0fc76d1655eac1036b4e
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1
index 97b03fab0d6a..23cce3ab6a3e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4b8812850c02cd23d91270b39dc05f8a
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2
index 48e270b381a2..e082f90386cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4b8812850c02cd23d91270b39dc05f8a
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3
index 2c9db0aedb95..05c096457b24 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bc6281b3a9c94a3392df4c161354a676
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180701-r1
new file mode 100644
index 000000000000..4ea32e26c08d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cpufreqselector
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=bc6281b3a9c94a3392df4c161354a676
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
index 214b8e542d5a..ecfb61583caa 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bc6281b3a9c94a3392df4c161354a676
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2
deleted file mode 100644
index ec7e13d8f9a7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3
deleted file mode 100644
index 867725842f37..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cups
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bbaa70d7c9bc588d28d81dd98b098c9b
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1
index cc796d2e2b39..92bbe799886f 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b00642f4e226a41a220bd045d005ea8f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2
index 3b6cdaa207b4..0944fb4b6c9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b00642f4e226a41a220bd045d005ea8f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3
index 31929b5d8d45..2d990b266a21 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ed59ab933d1f2038aaaacf4330cf909f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20180701-r1
new file mode 100644
index 000000000000..17c7f3a23e1a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cups
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ed59ab933d1f2038aaaacf4330cf909f
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-9999 b/metadata/md5-cache/sec-policy/selinux-cups-9999
index 8057a38038ad..63d64a744dde 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cups-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ed59ab933d1f2038aaaacf4330cf909f
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2
deleted file mode 100644
index 87aa68ff1634..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3
deleted file mode 100644
index 312412821b94..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cvs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=90f94d283dd2bb3e8e70b5d68203cdde
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1
index 5c164cda57a0..839486d0a547 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5dab34abd92ef3c1c89059e17e09dd89
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2
index 216584585068..d9c8cef863e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5dab34abd92ef3c1c89059e17e09dd89
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3
index b7338cb23f03..1d001304dd64 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=600e9d4e0e92bb3016960dc55955f96a
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180701-r1
new file mode 100644
index 000000000000..01b455eadc8b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cvs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=600e9d4e0e92bb3016960dc55955f96a
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-9999 b/metadata/md5-cache/sec-policy/selinux-cvs-9999
index 833b84817953..1de434ba83c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=600e9d4e0e92bb3016960dc55955f96a
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2
deleted file mode 100644
index fd3a520351a3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3
deleted file mode 100644
index 87d0d849ba79..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for cyphesis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=24533dc5ea7388d0e8a7c3530372a935
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1
index 4d54f681f628..1fbfbdcae9a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a203cf864ba3d5060dae7ce0fb08653d
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2
index 98ce5ce0901c..b24b8af291a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a203cf864ba3d5060dae7ce0fb08653d
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3
index ca3a50f3caae..7b11d9570bdb 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a04c18a0974badfef5e35c236b61b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180701-r1
new file mode 100644
index 000000000000..34a6f67c458b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cyphesis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a04c18a0974badfef5e35c236b61b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999 b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
index 07a979f6027b..a75660194dc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a04c18a0974badfef5e35c236b61b87c
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2
deleted file mode 100644
index 84903c3de146..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3
deleted file mode 100644
index 05aefdcaf3b3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for daemontools
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cd77a7c1ae74120ab56f6359a1ab2d2e
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1
index 86344a915115..4479c0428bf4 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d190f559c2493439264deba5bd9f3a86
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2
index e449dd0ede91..3617f5f4dfb7 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d190f559c2493439264deba5bd9f3a86
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3
index 20466bf682b1..67e6907226a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f92f902fcd22781fbca6d6b9aaca237a
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180701-r1
new file mode 100644
index 000000000000..9cb3f7e0f98a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for daemontools
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f92f902fcd22781fbca6d6b9aaca237a
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-9999 b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
index 029ddc733f2c..e01e2fff2b5a 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-9999
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f92f902fcd22781fbca6d6b9aaca237a
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2
deleted file mode 100644
index 72cefe8abef4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3
deleted file mode 100644
index d6c7eeb31bcb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dante
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=19da747291039ecc2d490e7c89a05924
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1
index ee17bad5475a..de0060e969cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5095ec4c18e0235dc363120a1c59f5d0
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2
index b1c82669dae1..b091fe8b6fdd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5095ec4c18e0235dc363120a1c59f5d0
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3
index b2dc38fccddb..f444cc0e8fae 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=21fed5f77fb3857903358ed0d7174574
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dante-2.20180701-r1
new file mode 100644
index 000000000000..85552349f97e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dante
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=21fed5f77fb3857903358ed0d7174574
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-9999 b/metadata/md5-cache/sec-policy/selinux-dante-9999
index 4e02ea1987f7..d474bb437134 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dante-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=21fed5f77fb3857903358ed0d7174574
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2
deleted file mode 100644
index ea959e3505cc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3
deleted file mode 100644
index 6a4304637162..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbadm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f8bf71e32f9c7362270ceae2799714a3
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1
index d89030c3ef91..25d8ada7945a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=da270ffb723c8bde4e2eb3899a2c2210
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2
index a60bbf005a12..5ba0d3e5246d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=da270ffb723c8bde4e2eb3899a2c2210
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3
index 851f811c73fb..8b938a7ae7e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=19a8b60bf07619f01e23bfb5ec48bba8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180701-r1
new file mode 100644
index 000000000000..f2b69309fcce
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbadm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=19a8b60bf07619f01e23bfb5ec48bba8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-9999 b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
index 713b30e73e9e..5eab58a10743 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=19a8b60bf07619f01e23bfb5ec48bba8
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2
deleted file mode 100644
index d4e11d692e2a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3
deleted file mode 100644
index a31ba6bafac7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbskk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=42da6e0f30c255c6d46d8e8a3ec56b7f
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1
index 1dfce1c89d0d..ed88de06dcb0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bb5b4550998fcb639bddbb057c82e477
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2
index 611d9badcb74..8fa9207be152 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bb5b4550998fcb639bddbb057c82e477
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3
index 6bb3b3dde51d..3a42d8313929 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e674fda7afc279cf04870415d69b1444
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180701-r1
new file mode 100644
index 000000000000..a76b5d93b5ad
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbskk
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e674fda7afc279cf04870415d69b1444
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-9999 b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
index f98cdba71d07..ac7c42bc2e49 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e674fda7afc279cf04870415d69b1444
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2
deleted file mode 100644
index 50e871a6f39e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3
deleted file mode 100644
index 6cdfdf23a9a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dbus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=40afa27f03be9d71aae25894762a8577
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1
index 71485d568154..5d3f023612b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fea71d6db2d44a9be7309f175e1ef889
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2
index be4438908aa5..870dae8b4005 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fea71d6db2d44a9be7309f175e1ef889
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3
index db7b41015447..e1f02435565d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f7bfcd307ce625af5fc33f13cf484a7
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180701-r1
new file mode 100644
index 000000000000..c438edd3e26c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dbus
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=9f7bfcd307ce625af5fc33f13cf484a7
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-9999 b/metadata/md5-cache/sec-policy/selinux-dbus-9999
index 813ca3d483cd..c40d868c206c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f7bfcd307ce625af5fc33f13cf484a7
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2
deleted file mode 100644
index 3190b496316d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3
deleted file mode 100644
index 13de7591adbc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=310cad115fee2d54e1c4c106ab1d79c5
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1
index fbbe21b2a32d..fd2b874c01b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bac44007bdbe30c64c3d20ad39c6b468
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2
index 70845e73cf8d..0d52e84a58a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bac44007bdbe30c64c3d20ad39c6b468
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3
index 25e73f17d0ec..9ec2d654f257 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e479ec6a8613a581d17fd3379c8cdfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180701-r1
new file mode 100644
index 000000000000..a0f317d6ed61
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dcc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e479ec6a8613a581d17fd3379c8cdfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-9999 b/metadata/md5-cache/sec-policy/selinux-dcc-9999
index a4fada85c63b..5da3b119bd87 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e479ec6a8613a581d17fd3379c8cdfd0
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2
deleted file mode 100644
index fb00824dc546..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3
deleted file mode 100644
index 448fa515f901..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddclient
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c3fab2289dc4784db080dedd1795cc08
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1
index 6d7e07be1e16..24e810974e3e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0667727599f961e451a7aa89d34e7191
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2
index de990aedb5be..dab96c5efd79 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0667727599f961e451a7aa89d34e7191
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3
index 8a98c1c8d6d9..f01b0a2bc6d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=50c0f7501d8451dda9e5e9373acb7f4f
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180701-r1
new file mode 100644
index 000000000000..63dc8add0b82
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ddclient
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=50c0f7501d8451dda9e5e9373acb7f4f
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-9999 b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
index c5cbc6c1ea17..330503a325bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=50c0f7501d8451dda9e5e9373acb7f4f
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2
deleted file mode 100644
index 88256c2b9949..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3
deleted file mode 100644
index 8e9d4eb003fd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ddcprobe
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d0a3b0e6526e205eeca1c47fedecfadf
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1
index 6c4df8047f6b..9c34661dc522 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3176db9a9cc716335ab5ef7f981c505e
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2
index 0e749c0f64b4..c8b55d253a9f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3176db9a9cc716335ab5ef7f981c505e
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3
index 204ddfad3bed..5cb4068c0bb0 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b69209937601cc7a4351de0421e4a0ec
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180701-r1
new file mode 100644
index 000000000000..8794493870ae
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ddcprobe
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b69209937601cc7a4351de0421e4a0ec
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
index f811f0c8e5b8..a801e37bb477 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b69209937601cc7a4351de0421e4a0ec
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2
deleted file mode 100644
index 74393d140775..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3
deleted file mode 100644
index 5208d3113f76..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for denyhosts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=31f288f849e806e5ef4dec1f56df0d02
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1
index 70b26482e41d..87e4a87e660c 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aad7295292c9a69c9b29df280ef98b3d
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2
index 27e7698e959c..3876967bb918 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aad7295292c9a69c9b29df280ef98b3d
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3
index e2424b2aa7ae..537ba098e57e 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a20cc2defc7711dbb5b227904f2634a4
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180701-r1
new file mode 100644
index 000000000000..a12b47fa631c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for denyhosts
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a20cc2defc7711dbb5b227904f2634a4
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999 b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
index a6959e61db22..fc289548ae3f 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a20cc2defc7711dbb5b227904f2634a4
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2
deleted file mode 100644
index a459594a575b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3
deleted file mode 100644
index d94f3f81e3d9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for devicekit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b9404817c8be4f237bcfe079483e93ca
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1
index e7cef50d9321..5175f033051b 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b810de882ef4a0878eb58c07e6f62d3d
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2
index c4c58b250575..3c92e40996bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b810de882ef4a0878eb58c07e6f62d3d
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3
index 901fa499b643..91441931b94d 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3472ebfd1d55ecd1ef1051cb76d76f77
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180701-r1
new file mode 100644
index 000000000000..e041e77a7476
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for devicekit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3472ebfd1d55ecd1ef1051cb76d76f77
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-9999 b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
index a0a0b8c7b4d8..0788b5269e49 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3472ebfd1d55ecd1ef1051cb76d76f77
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2
deleted file mode 100644
index 617ed72e3580..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3
deleted file mode 100644
index 4a2a57ff6ade..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dhcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7558f078acb6c8b35a30ec3c62be810e
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1
index 8b06ff9e3c39..6de625d07ed5 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=33086cc3a4fabacf0e6587518ee22de2
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2
index 92b34e50f429..ecfd1515d967 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=33086cc3a4fabacf0e6587518ee22de2
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3
index 8af8e54939e6..762f28a40939 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0c000734cdc03f5f48396432d3eefbd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180701-r1
new file mode 100644
index 000000000000..af04679e78b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dhcp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0c000734cdc03f5f48396432d3eefbd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-9999 b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
index 90aff825429b..542b2ab88e50 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0c000734cdc03f5f48396432d3eefbd0
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2
deleted file mode 100644
index c3835ee5f5bf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3
deleted file mode 100644
index 990d2c62cacd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dictd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1cdc34c51b1912670890c9f23289fca4
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1
index 14966c3bf7d3..6fbb3e57d4fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ecee7ebc63a3e52e92a07771fcc3467
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2
index 578b7f72964d..d222f63c564b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ecee7ebc63a3e52e92a07771fcc3467
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3
index d32907d7a2c0..fdcd6071b53c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6805124de202098a796f5b9d312937f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180701-r1
new file mode 100644
index 000000000000..c305e2f5b910
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dictd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6805124de202098a796f5b9d312937f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-9999 b/metadata/md5-cache/sec-policy/selinux-dictd-9999
index b4a6f6a6c024..9da7e5d8ec76 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6805124de202098a796f5b9d312937f0
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1
index e887d4743d99..658bdfe26c1a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b07f684924df75f49c6770fd568b02cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2
index ff241c586a37..c19ac02f3503 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b07f684924df75f49c6770fd568b02cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3
index 12dc0b160d64..177e49dfad44 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aeb7d8b51cfca2a6666e40c2fa1f4b99
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180701-r1
new file mode 100644
index 000000000000..5dad0399c1fc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dirmngr
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=aeb7d8b51cfca2a6666e40c2fa1f4b99
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-9999 b/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
index 80e6c4ddc3c1..398e49017ad3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aeb7d8b51cfca2a6666e40c2fa1f4b99
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2
deleted file mode 100644
index cf2a68bfb0e4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3
deleted file mode 100644
index eb788d5a5da2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dirsrv
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=adf9fd5ed7e2255013c96da8f20351d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1
index b9f9e9ad5711..e7d7aeedf255 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=db0461c229ca574ff165c77777934540
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2
index 9739b29f9fde..1018b0f4eb13 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=db0461c229ca574ff165c77777934540
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3
index ac4d38317c38..d7e18e99c12c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8340c8c49a2eb477b2eac7bd04cc378a
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180701-r1
new file mode 100644
index 000000000000..e4f0e1652403
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dirsrv
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8340c8c49a2eb477b2eac7bd04cc378a
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999 b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
index 73f03608e4d4..429e8e6da7d7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8340c8c49a2eb477b2eac7bd04cc378a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2
deleted file mode 100644
index a9c62a53804a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3
deleted file mode 100644
index d710a1e292d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for distcc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d15c00417daf62611516398f74eec6d4
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1
index d1df0ae3c842..86af648c56ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=baaa0a6f43da8ad51e22ff84e3ed7d2a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2
index cd3fdd07ecff..f67f9e556e1a 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=baaa0a6f43da8ad51e22ff84e3ed7d2a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3
index 9fc9d85ffb08..b349ac84e040 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f95ec299de8231f1614a197143f4f230
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180701-r1
new file mode 100644
index 000000000000..c39b2dc55131
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for distcc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f95ec299de8231f1614a197143f4f230
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-9999 b/metadata/md5-cache/sec-policy/selinux-distcc-9999
index afe25e801d9a..907b001a4e74 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f95ec299de8231f1614a197143f4f230
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2
deleted file mode 100644
index da781a1d8769..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3
deleted file mode 100644
index aa35355bafdf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for djbdns
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cb6e8f3acd440905edeff9253ed560f2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1
index 9ebe10b2343b..06f1770a0ea7 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=97b600c736a4a0e5d5bc8632150aa35b
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2
index f8d61f0b3147..aafd496be537 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=97b600c736a4a0e5d5bc8632150aa35b
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3
index a47eab66fef2..72b518b6137b 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e2f70fd197165d47a605fa7563a041d5
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180701-r1
new file mode 100644
index 000000000000..1a1e472ef90d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for djbdns
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e2f70fd197165d47a605fa7563a041d5
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-9999 b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
index c4b5bc23fe9a..4aa26df146d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-9999
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e2f70fd197165d47a605fa7563a041d5
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2
deleted file mode 100644
index 7846eb96d736..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3
deleted file mode 100644
index a02068313d03..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dkim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=77ef644657faf5cde5bb17c4ac0f7689
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1
index 2fddf80900bc..f01900fca6a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0a30fc3e6300aa1c9159310f919897f4
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2
index d5ea83e31f5f..4fa5db2df102 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0a30fc3e6300aa1c9159310f919897f4
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3
index 7e382986c96a..beed2b58379e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cb2fbed69e0a70a028f66739d5e04928
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180701-r1
new file mode 100644
index 000000000000..4ffd542cc9c0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dkim
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=cb2fbed69e0a70a028f66739d5e04928
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-9999 b/metadata/md5-cache/sec-policy/selinux-dkim-9999
index f742f462529d..1b938fc6a4f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cb2fbed69e0a70a028f66739d5e04928
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2
deleted file mode 100644
index a1ae1e832570..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3
deleted file mode 100644
index deb099481644..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dmidecode
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2a00086cf9335b49bdb06227b54fa900
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1
index 3a7e30a95251..07ace05644bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=10c990ea38c3a1f9098f24a12961a521
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2
index 6471f4d58aee..50ca55f89d4f 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=10c990ea38c3a1f9098f24a12961a521
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3
index 765b54c8593a..9a9fb067a8c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=de146b39383d84aef2be71f7b1964a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180701-r1
new file mode 100644
index 000000000000..e4e522701358
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dmidecode
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=de146b39383d84aef2be71f7b1964a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999 b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
index b44df1339b9f..153432aea16c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=de146b39383d84aef2be71f7b1964a7b
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2
deleted file mode 100644
index 11bbf23575c8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3
deleted file mode 100644
index ebbeed10e1c7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dnsmasq
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=698fa5f422d3d9ab4625f281cb150bbc
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1
index becad0d24634..e8b357cda07c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=be2367865cd759d9d9711a80656756e0
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2
index 23796edfd750..6d44e911e67f 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=be2367865cd759d9d9711a80656756e0
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3
index 80b6653809bf..c162d3d096c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bee8766bfeaffdb551573149d02275cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180701-r1
new file mode 100644
index 000000000000..6fa55379d554
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dnsmasq
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=bee8766bfeaffdb551573149d02275cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
index 2bcf393bc3b7..5961e13a269c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bee8766bfeaffdb551573149d02275cb
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2
deleted file mode 100644
index 072105ea225b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3
deleted file mode 100644
index 5c030d484865..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dovecot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=67eb9d16dce460a456d2c3cc5ecc1c58
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1
index 0bc387d24e60..c523e1e7fb09 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=985a71d4a5d23589308d13e6049363c6
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2
index 446fe7fbdd20..3adffb9b4023 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=985a71d4a5d23589308d13e6049363c6
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3
index 32bc6347a618..8c5cafcb16ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3e08f1b1a30f3feaf89bb34245b4a138
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180701-r1
new file mode 100644
index 000000000000..7d0afaf492f0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dovecot
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3e08f1b1a30f3feaf89bb34245b4a138
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-9999 b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
index fb00f5eca946..5677df1cffa9 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3e08f1b1a30f3feaf89bb34245b4a138
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2
deleted file mode 100644
index 5cc942439e6c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3
deleted file mode 100644
index b614df3f4ca5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dpkg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9affb9c1aa561177068ffaef260d7941
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1
index 3cf254aaa32c..31355a22798a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=71746682835c4f9953872179cc00487f
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2
index f9994dd82512..9ae2c070e38b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=71746682835c4f9953872179cc00487f
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3
index 1022bf23bbde..01f855e21770 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2fc6ea29cec83b9ba99ee455a53f62dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180701-r1
new file mode 100644
index 000000000000..1712c23ecc7f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dpkg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2fc6ea29cec83b9ba99ee455a53f62dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-9999 b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
index 316c78a3fc67..f187073536b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2fc6ea29cec83b9ba99ee455a53f62dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2
deleted file mode 100644
index 9f7e56118709..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3
deleted file mode 100644
index 8c9e193460d3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dracut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=17696c048424b5c69b002bdc1530a41e
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1
index f465479f24b6..935058f98221 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=18d363f14765f65bb91d64919940af87
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2
index 51ccfdbf648d..f5af622e1af2 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=18d363f14765f65bb91d64919940af87
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3
index 7d0c8e5bc7f5..14361b156770 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c1d19bf0d4f3f884467e5da805ad49b3
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180701-r1
new file mode 100644
index 000000000000..128f4b55f490
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dracut
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c1d19bf0d4f3f884467e5da805ad49b3
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-9999 b/metadata/md5-cache/sec-policy/selinux-dracut-9999
index 9f58749b9c57..1fcff984a5d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c1d19bf0d4f3f884467e5da805ad49b3
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2
deleted file mode 100644
index 73064d558ec3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3
deleted file mode 100644
index aa7969d5602a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for dropbox
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0e24af57fb3f20ba5ae8ccbe4b44cbcc
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1
index 869aaba0fe06..b08f82977c4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5a5aed343fcff4466efe93ca2fd33a1f
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2
index 71804e8b4142..f96b37155ab1 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5a5aed343fcff4466efe93ca2fd33a1f
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3
index 23378813aca0..3c2fb7cbae2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=37c3b4936f46741524f45f3542017908
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180701-r1
new file mode 100644
index 000000000000..468ec961939e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for dropbox
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=37c3b4936f46741524f45f3542017908
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-9999 b/metadata/md5-cache/sec-policy/selinux-dropbox-9999
index fe1f8487feff..0a79a7399bde 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=37c3b4936f46741524f45f3542017908
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2
deleted file mode 100644
index bfca6f7dd801..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3
deleted file mode 100644
index cfc7b57b5aea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for entropyd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9b802412aba3f696eabce781e5b593fa
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1
index 2ad759ea794c..61ef8181c5bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cf51a455cac7caf83cb7a60554db0823
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2
index af928a828559..90092fcce490 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cf51a455cac7caf83cb7a60554db0823
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3
index fbda8d248bcd..e4ef7af63df4 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ec95a57b284dfb497abe1b16ed679c81
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180701-r1
new file mode 100644
index 000000000000..760b17083920
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for entropyd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ec95a57b284dfb497abe1b16ed679c81
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-9999 b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
index 567df2a3b961..6a3ceb28afe8 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ec95a57b284dfb497abe1b16ed679c81
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2
deleted file mode 100644
index 64132ee06065..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3
deleted file mode 100644
index ca4d1d32fdce..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for evolution
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=be8061378d0014f9c00b492382a98249
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1
index 000a9a8f88b9..d20c3defeebe 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ced170eb2125566505c6617c21df80d9
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2
index 259bdfae160b..117f67675b84 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ced170eb2125566505c6617c21df80d9
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3
index 5b1ad28a5770..e3c702192834 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=15b4036d07b8d94c95fb56f31ea5bda6
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180701-r1
new file mode 100644
index 000000000000..1f40227f5e1b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for evolution
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=15b4036d07b8d94c95fb56f31ea5bda6
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-9999 b/metadata/md5-cache/sec-policy/selinux-evolution-9999
index 72331bd48982..68a34b05bd40 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-9999
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=15b4036d07b8d94c95fb56f31ea5bda6
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2
deleted file mode 100644
index 647babccf463..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3
deleted file mode 100644
index c95a3a9a86ea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for exim
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=aba717ee10dc6621c75bcfb25d4c670a
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1
index e2648306aa16..2075bf85da79 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=900546d4b5abfea36088a96374dabf91
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2
index 36ac9c0e78bc..2acfd2a6f330 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=900546d4b5abfea36088a96374dabf91
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3
index cc06519afbfe..73bea5b1fcad 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dac426e919560161d269ac8c8e9340aa
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-exim-2.20180701-r1
new file mode 100644
index 000000000000..59e30e668e1b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for exim
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=dac426e919560161d269ac8c8e9340aa
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-9999 b/metadata/md5-cache/sec-policy/selinux-exim-9999
index c5a7912dc88c..80c5b7501cc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-exim-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dac426e919560161d269ac8c8e9340aa
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2
deleted file mode 100644
index 1f8242fdb0d5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3
deleted file mode 100644
index dcba4c208c57..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fail2ban
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a64abda4b4ae124717ff16ea8c919563
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1
index 9ca760bb46a0..d7b448684c0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c634c708e6386f8d226cb506813dbccd
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2
index 31adf1230059..9c6b14a61fe5 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c634c708e6386f8d226cb506813dbccd
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3
index 30276d67c762..7d97ed3000ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8713f8597ddc8563a6745b7352742f69
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180701-r1
new file mode 100644
index 000000000000..218888538509
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fail2ban
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8713f8597ddc8563a6745b7352742f69
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999 b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
index 933c6d22aad1..cb01616156b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8713f8597ddc8563a6745b7352742f69
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2
deleted file mode 100644
index 03bb6f2e6c21..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3
deleted file mode 100644
index 06cd8c5c829c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fetchmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3154cf2616c26e963795a1e06d0afdf8
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1
index 180c1ab83b67..17df60709541 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3eab8e876d7893f9720c0d7834b57137
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2
index 6734ee254fc1..5560d6c8f499 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3eab8e876d7893f9720c0d7834b57137
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3
index 1b9a699c758b..a6f7f42236f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3d27259ac599d9a06d76e26c9682dd80
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180701-r1
new file mode 100644
index 000000000000..892e49a15b74
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fetchmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3d27259ac599d9a06d76e26c9682dd80
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999 b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
index bde79028b0a8..08e330631113 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3d27259ac599d9a06d76e26c9682dd80
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2
deleted file mode 100644
index ce5ef8efa476..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3
deleted file mode 100644
index a0ed4ac8d548..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for finger
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f6fa12d3b5c06ddc964798a80d8b4949
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1
index b70b7dbae64f..e7a95bf4d692 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e40d578e9dbc1030c46f312a94203b4
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2
index 5dea24c662ef..abc10c33740d 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e40d578e9dbc1030c46f312a94203b4
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3
index 7a3628f8c7db..87b9b6120505 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=065b41adc2f4a4261eaa3f7ae9a3c7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-finger-2.20180701-r1
new file mode 100644
index 000000000000..a41d7bffd01d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for finger
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=065b41adc2f4a4261eaa3f7ae9a3c7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-9999 b/metadata/md5-cache/sec-policy/selinux-finger-9999
index f166facad703..be25d27a0906 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-9999
+++ b/metadata/md5-cache/sec-policy/selinux-finger-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=065b41adc2f4a4261eaa3f7ae9a3c7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2
deleted file mode 100644
index 821c3fb5a661..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3
deleted file mode 100644
index 3fec57dc3410..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for flash
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f6da9ca0b2b1323b16220bcde79f4094
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1
index 4da92702aa47..26abff81ef85 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=15c256b7d965e58e73419a50f416b346
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2
index 2dc458c79938..937acbdef395 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=15c256b7d965e58e73419a50f416b346
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3
index 7e41b6f014d9..0eb9d3793f3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0bbb275099e2eb98f4f1037a13127187
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-flash-2.20180701-r1
new file mode 100644
index 000000000000..0652ac34dd0b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for flash
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0bbb275099e2eb98f4f1037a13127187
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-9999 b/metadata/md5-cache/sec-policy/selinux-flash-9999
index fb5fdaca4d2d..6248ae45aa25 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-9999
+++ b/metadata/md5-cache/sec-policy/selinux-flash-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0bbb275099e2eb98f4f1037a13127187
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2
deleted file mode 100644
index 3f04e302b60c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3
deleted file mode 100644
index 04e2bb7c506b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for fprintd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2991fb89640a831c8a2a93a0dc0de9ec
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1
index e6dbde33a64f..dc50d7e6c267 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a05891ee3959752ca36a9d0894577a57
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2
index dfd94fb17f1c..be2325acbbf9 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a05891ee3959752ca36a9d0894577a57
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3
index 378413e1f711..83413b715fcf 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9d0c5b63e5707d085809b28c19c55ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180701-r1
new file mode 100644
index 000000000000..ae71e7ce7202
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for fprintd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=9d0c5b63e5707d085809b28c19c55ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-9999 b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
index b0cc93bfaa3f..b8d2ae75a3fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9d0c5b63e5707d085809b28c19c55ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2
deleted file mode 100644
index 4764af587106..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3
deleted file mode 100644
index 62060093c4bb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a7317511a6861f22dd7ce14520799f77
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1
index c43093740dad..5d7640549a95 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8311f4b8418656d59282e3281bd49a40
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2
index 06374740a5e0..41d3ce0073e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8311f4b8418656d59282e3281bd49a40
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3
index 62510cebbc8a..bf7ba4404b9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=01bb3f55cfbdb27f32b197fe1eabdf8b
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180701-r1
new file mode 100644
index 000000000000..af0f4c57c5d1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ftp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=01bb3f55cfbdb27f32b197fe1eabdf8b
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-9999 b/metadata/md5-cache/sec-policy/selinux-ftp-9999
index d5839f32e10e..786718fa628e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=01bb3f55cfbdb27f32b197fe1eabdf8b
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2
deleted file mode 100644
index df16024b5257..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3
deleted file mode 100644
index 98a14c1af742..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for games
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c230ee293240d58175c21920898d01fe
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1
index dcd079e3b521..05eff17243c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6088ed3e1e4ce2d247b4b8fbaf249a36
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2
index f818e8f9819f..5e7fbf8ff844 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6088ed3e1e4ce2d247b4b8fbaf249a36
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3
index 4c920986d136..80d951fa15a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=92942c4e520676a59d1dec32de035cb1
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-games-2.20180701-r1
new file mode 100644
index 000000000000..2372c2919eed
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for games
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=92942c4e520676a59d1dec32de035cb1
diff --git a/metadata/md5-cache/sec-policy/selinux-games-9999 b/metadata/md5-cache/sec-policy/selinux-games-9999
index 1f1e3e65f56f..e184ac1e4e24 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-9999
+++ b/metadata/md5-cache/sec-policy/selinux-games-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=92942c4e520676a59d1dec32de035cb1
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2
deleted file mode 100644
index 3816fef4ef65..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3
deleted file mode 100644
index ac525d5926d0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gatekeeper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=93e0f2b3d070dbf84dec6f591bd609a0
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1
index 5a484e63cbc2..73d3079c0cfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5452472920c2e145747feb846423368c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2
index 874226eb2919..ca9e01a05d69 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5452472920c2e145747feb846423368c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3
index 11dce79c2ed0..c4c951f7b47e 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ca55524df9a98c2dcee6e5bb34543a7c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180701-r1
new file mode 100644
index 000000000000..3fe1e3f1d565
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gatekeeper
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ca55524df9a98c2dcee6e5bb34543a7c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
index 8899290e6442..ae461510816e 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ca55524df9a98c2dcee6e5bb34543a7c
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2
deleted file mode 100644
index e9f4ffa37196..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3
deleted file mode 100644
index e31d2fd9081d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for git
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=35146e6fe995bbdc475e9bb96de88d76
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1
index 09cecb927a24..2e47734e1710 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f964a4d219b71290e9c4a8f250f4364
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2
index c9b227d0a581..fa3e448c2c35 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f964a4d219b71290e9c4a8f250f4364
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3
index ff228d4dd6de..ebbb3b45085c 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ccaa3811c64cc90355b99c67d9f9e32
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-git-2.20180701-r1
new file mode 100644
index 000000000000..e39d2674112d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for git
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2ccaa3811c64cc90355b99c67d9f9e32
diff --git a/metadata/md5-cache/sec-policy/selinux-git-9999 b/metadata/md5-cache/sec-policy/selinux-git-9999
index 6e2706e55799..b6024c761c21 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-9999
+++ b/metadata/md5-cache/sec-policy/selinux-git-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ccaa3811c64cc90355b99c67d9f9e32
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2
deleted file mode 100644
index 369555f44cba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3
deleted file mode 100644
index 936a1525eb88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gitosis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8f37cd66d39870e443655c71d9f5b30f
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1
index 4da14d94fa78..5a14b2c78ea5 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c5ad1f470a2a05a23bb5558631ef9513
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2
index 7b4a44b0466f..65d5140912b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c5ad1f470a2a05a23bb5558631ef9513
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3
index a99e1152c080..382639a88885 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3144f7dad228b9ed82491143420a0f63
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180701-r1
new file mode 100644
index 000000000000..a2e897b2a5f2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gitosis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3144f7dad228b9ed82491143420a0f63
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-9999 b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
index c8a7b0c6e49a..4724b4452dff 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3144f7dad228b9ed82491143420a0f63
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2
deleted file mode 100644
index 8080f0d0d526..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3
deleted file mode 100644
index 3b880576e057..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gnome
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3c5345c8cea8429cc1978557da4e3623
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1
index 6bc247f8adb8..a972556ba3a8 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5ecdef093d8f02ac1a07450e8f1fb72b
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2
index 145599f6fa52..c1016f3ed75b 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5ecdef093d8f02ac1a07450e8f1fb72b
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3
index ab24cce2434a..f956ad154785 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6c73d42e4cd3156a1b86b0f012c62abf
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180701-r1
new file mode 100644
index 000000000000..f1f69c0d9ea1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gnome
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6c73d42e4cd3156a1b86b0f012c62abf
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-9999 b/metadata/md5-cache/sec-policy/selinux-gnome-9999
index d9944010311b..466f95eb34f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6c73d42e4cd3156a1b86b0f012c62abf
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2
deleted file mode 100644
index 70f912501b20..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3
deleted file mode 100644
index e4b8449d2dff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20170805-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for googletalk
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=062aafc5859ac988384f3d6431266e49
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1
index 295602b0b6ad..fb37f93b3e98 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aba00bb2ce16d5bc0b89d88bf17adad5
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2
index 45bebd9d18c0..f085c275f1a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aba00bb2ce16d5bc0b89d88bf17adad5
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3
index 08055eb9913b..a188367de2af 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180114-r3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f65ad8b8522c09b51eff558e6080d1cd
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180701-r1
new file mode 100644
index 000000000000..7cc8d718169b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for googletalk
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f65ad8b8522c09b51eff558e6080d1cd
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-9999 b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
index b19e67066b8b..0571d86ef75f 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f65ad8b8522c09b51eff558e6080d1cd
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2
deleted file mode 100644
index b195414e1a85..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3
deleted file mode 100644
index 86cdf980d487..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gorg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c54056b294a59b2ef106e7f606c80cc2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1
index 59646e796aec..e2afec3f1328 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f83dea73b635e85b66c5a3e16dccb500
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2
index 1691ff56979f..4815137e0a50 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f83dea73b635e85b66c5a3e16dccb500
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3
index d5afa00e8809..d8312b006870 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e7433ee2aa06e239cb50ebe76f364e3
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180701-r1
new file mode 100644
index 000000000000..f1ad38da8956
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gorg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=9e7433ee2aa06e239cb50ebe76f364e3
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-9999 b/metadata/md5-cache/sec-policy/selinux-gorg-9999
index 207e40a623a7..b6741b4dceff 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e7433ee2aa06e239cb50ebe76f364e3
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2
deleted file mode 100644
index 11a376b8ce53..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3
deleted file mode 100644
index 7d7cac2ee8d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=83edb934f9204b78ebb3915f2c5d7a91
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1
index a6149571b894..97deb32c7de5 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c066576734fcf3607aa54d9e38357f5b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2
index 597b77e05a32..b6b7e9b12aae 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c066576734fcf3607aa54d9e38357f5b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3
index dd92b0b06b6e..95f22a616948 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=14fb4248078e83fac196685d197b977b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180701-r1
new file mode 100644
index 000000000000..c7e7e39e3a77
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=14fb4248078e83fac196685d197b977b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-9999 b/metadata/md5-cache/sec-policy/selinux-gpg-9999
index 05242384644c..480a9da9a919 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=14fb4248078e83fac196685d197b977b
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2
deleted file mode 100644
index b6f22d357cb9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3
deleted file mode 100644
index 47bc3f824728..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=480d9643d19bac0799c7100d8bcf6c2a
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1
index 00285666c901..bc851ab090bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=47e7117ff5963f6ef0dae7b79386b857
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2
index 7e52e2760767..32f439aa9021 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=47e7117ff5963f6ef0dae7b79386b857
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3
index 44f92b4e5f15..d54724ea8645 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=97b272e2127cb3138af8be6ef3218e71
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180701-r1
new file mode 100644
index 000000000000..67659b78e2b1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=97b272e2127cb3138af8be6ef3218e71
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-9999 b/metadata/md5-cache/sec-policy/selinux-gpm-9999
index 3939351fedd6..918ba1bea1cd 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=97b272e2127cb3138af8be6ef3218e71
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2
deleted file mode 100644
index e447419e1e13..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3
deleted file mode 100644
index 51f1e7a2107a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gpsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b14d7210912d0dda0f863a120a7f3d8e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1
index a44cca05b1c3..c7fa184a9821 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3b976754e0ddd95cc0f2508452c9a8e4
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2
index 344afac0d61c..83852fb5aec1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3b976754e0ddd95cc0f2508452c9a8e4
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3
index d8e7c36ca24e..0f056e4e43a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=84ae7deabd5b83808eea7949c928d6da
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180701-r1
new file mode 100644
index 000000000000..beae56380355
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gpsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=84ae7deabd5b83808eea7949c928d6da
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-9999 b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
index 092a2f575bae..4155ece5b733 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=84ae7deabd5b83808eea7949c928d6da
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3
deleted file mode 100644
index 7f58d96d93dd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for gssproxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7f29e9196764bef2443994c348ce59e4
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1
index 156fc19faa2f..80861a5f4e13 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=38162a9a97ce82da8280b93945e2b433
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2
index a476de8fc5a2..c6f4cca3a2a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=38162a9a97ce82da8280b93945e2b433
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3
index 8c6cd97e9128..b90a2c86d7bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1c7c7971be4ca81d566ea190ee8e2826
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180701-r1
new file mode 100644
index 000000000000..416a733f7a16
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for gssproxy
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1c7c7971be4ca81d566ea190ee8e2826
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-9999 b/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
index 7142cb0e2e71..a7ba1d600979 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1c7c7971be4ca81d566ea190ee8e2826
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2
deleted file mode 100644
index 0132a20f675e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3
deleted file mode 100644
index ea5600bbe1c9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for hddtemp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3885a13bc180c6d57dc8b0b1b2510f94
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1
index 39f0977b27ab..dcfea0ae0775 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a53316eb8f0605cada3ad70b138f56c3
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2
index 72ba1beb8983..d4166a15c9b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a53316eb8f0605cada3ad70b138f56c3
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3
index 2ec47d73f52f..5039685f3505 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b341134f7f23b798ad50f304cd74bbe0
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180701-r1
new file mode 100644
index 000000000000..3e2a50a1c8ab
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for hddtemp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b341134f7f23b798ad50f304cd74bbe0
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999 b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
index 1f5d5fb179c0..ec8f111c433c 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b341134f7f23b798ad50f304cd74bbe0
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2
deleted file mode 100644
index 5de0dfdd3e5e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3
deleted file mode 100644
index 70fed73f7607..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for howl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f8c5cd036dcba43813321e8817163bcb
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1
index cf4105b38d3a..eb983450405f 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6e389e23fbf78f00f0dd060a93f27de5
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2
index a1a97ca7dfe9..4b96c8ba52e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6e389e23fbf78f00f0dd060a93f27de5
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3
index 3e1022273d08..27d3798860e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4ea3579a40c14cedaab4c9df9e778dac
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-howl-2.20180701-r1
new file mode 100644
index 000000000000..d5e5a458094d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for howl
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=4ea3579a40c14cedaab4c9df9e778dac
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-9999 b/metadata/md5-cache/sec-policy/selinux-howl-9999
index 987bf83a2786..00277a5be84a 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-howl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4ea3579a40c14cedaab4c9df9e778dac
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2
deleted file mode 100644
index 2e5603fc0a2f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3
deleted file mode 100644
index 3fc164a78a7d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for icecast
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=900bddeca736d1025e66d4b675215298
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1
index ecb2cedc9048..77a4355ed3b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8d4cca57f5273f668fec15252848562b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2
index 84230ba74afc..84a85023f64d 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8d4cca57f5273f668fec15252848562b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3
index 9e83ceb49be8..9e59a1330c58 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ebf0f3ccc6dd5e0c0c9aeac66a92629b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180701-r1
new file mode 100644
index 000000000000..dd91cbb3c995
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for icecast
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ebf0f3ccc6dd5e0c0c9aeac66a92629b
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-9999 b/metadata/md5-cache/sec-policy/selinux-icecast-9999
index 79ee83dae0e6..62ba44c44ab0 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-9999
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ebf0f3ccc6dd5e0c0c9aeac66a92629b
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2
deleted file mode 100644
index 1c0176987bb3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3
deleted file mode 100644
index 0ca57ac3163e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ifplugd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=528774474da99306245cd326228fb7c0
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1
index e8ff5e2f9cfa..09945dfb0c38 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=efa258d7c669f807475e511e835cf554
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2
index fbecaffeadb7..f65fe427f628 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=efa258d7c669f807475e511e835cf554
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3
index 868698b31c35..ae7839847b01 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=90bc06855704fe846b0d34fbdee2e085
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180701-r1
new file mode 100644
index 000000000000..e64ea8d3f5d2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ifplugd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=90bc06855704fe846b0d34fbdee2e085
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999 b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
index a9131141f2db..d7953721f1a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=90bc06855704fe846b0d34fbdee2e085
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2
deleted file mode 100644
index 6f126f24900a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3
deleted file mode 100644
index f15057a4f8e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for imaze
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a723771263beeabc3d533cf6eced5d6d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1
index 3f1b8fd9b0c9..0781d42356ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6c8d2073656d76f4b9bfee56d2939221
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2
index 0feccde06b98..9b6ad989403f 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6c8d2073656d76f4b9bfee56d2939221
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3
index dba404a7a2db..4da6a5b476b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=34af9bb0f008427666b01e1113ad95e8
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180701-r1
new file mode 100644
index 000000000000..aa685a3a908a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for imaze
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=34af9bb0f008427666b01e1113ad95e8
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-9999 b/metadata/md5-cache/sec-policy/selinux-imaze-9999
index 317f0310422a..beed6053ace8 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-9999
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=34af9bb0f008427666b01e1113ad95e8
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2
deleted file mode 100644
index 34acbfdb9913..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3
deleted file mode 100644
index 741a3ed35c32..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inetd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e9c9272bdc2f5d3acf5dfa1a543b018b
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1
index b7f35b4c9781..9bf1e97937b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=12906d51910cc2731bce8e56cf7d02ed
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2
index d8f62c43e360..fe1b22802285 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=12906d51910cc2731bce8e56cf7d02ed
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3
index 8e9ba369ef8f..00113ad34a3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8684b31777c04fb863d22f9f23dd8793
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180701-r1
new file mode 100644
index 000000000000..319951b823b8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for inetd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8684b31777c04fb863d22f9f23dd8793
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-9999 b/metadata/md5-cache/sec-policy/selinux-inetd-9999
index 52d255d7ae9a..91ef0660f0ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8684b31777c04fb863d22f9f23dd8793
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2
deleted file mode 100644
index d63ebe1b1a18..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3
deleted file mode 100644
index 6f944ee6b719..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for inn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a908b912cee40f8f8b87c52d650e3468
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1
index 4a31424b39d9..4a4e3f254c83 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f180a4b738bac41a0e6e463f3c278dd3
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2
index c9976a80c11f..5dc2f24830df 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f180a4b738bac41a0e6e463f3c278dd3
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3
index 314baeeb1cbe..da90ea73995f 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=763bc3633051da1d0262d0ee77f4dd49
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-inn-2.20180701-r1
new file mode 100644
index 000000000000..ca9cec876651
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for inn
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=763bc3633051da1d0262d0ee77f4dd49
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-9999 b/metadata/md5-cache/sec-policy/selinux-inn-9999
index a27c07ccac6a..62906e45f543 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=763bc3633051da1d0262d0ee77f4dd49
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2
deleted file mode 100644
index 8d7855ee81bd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3
deleted file mode 100644
index 950e2e5fcc1f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ipsec
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bfe9d293cc86de93721f7fa2c82fe9cc
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1
index 9c70c733b8ed..e8588b610a80 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5ed37bbef290b31ccd0925508e997595
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2
index 0ca9561c50ec..d008004a6221 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5ed37bbef290b31ccd0925508e997595
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3
index ca1e91629f5e..28848c8d243f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1686be44c8c33378dfc6b087a09be4b6
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180701-r1
new file mode 100644
index 000000000000..2ef512d9e0f7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ipsec
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1686be44c8c33378dfc6b087a09be4b6
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-9999 b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
index a5d208d16dca..3e11996004fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1686be44c8c33378dfc6b087a09be4b6
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2
deleted file mode 100644
index 4c4fdf9b8bff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3
deleted file mode 100644
index 19da8887181a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=63873181b1bed0ef2d5ec85a163e9118
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1
index 067ff4e2f371..cc6df62db5bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4b1d67b75d8f313576eec31f7280d381
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2
index d74d1e4b949d..13beb3a3ea99 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4b1d67b75d8f313576eec31f7280d381
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3
index 54d371defd39..60324f8e0551 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=70314fea9b4e61f44ada705fd260644e
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-irc-2.20180701-r1
new file mode 100644
index 000000000000..74435039351c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for irc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=70314fea9b4e61f44ada705fd260644e
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-9999 b/metadata/md5-cache/sec-policy/selinux-irc-9999
index c0cfdc1b5106..fb408af51cce 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=70314fea9b4e61f44ada705fd260644e
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2
deleted file mode 100644
index 58f40c3ca173..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3
deleted file mode 100644
index ee3cb413c54c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d78ed71728172102ec5a6451b97d1762
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1
index b1f4db6507be..46ea360e5325 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ce9a4e49560cccc0fd1ce8d96a2c1e6a
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2
index 4cb696f55be9..45e9412b2668 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ce9a4e49560cccc0fd1ce8d96a2c1e6a
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3
index 585d6013a7a5..46274cb99a62 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2e9084a79607964c845941de92d7d71d
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180701-r1
new file mode 100644
index 000000000000..09fc8d813906
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ircd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2e9084a79607964c845941de92d7d71d
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-9999 b/metadata/md5-cache/sec-policy/selinux-ircd-9999
index 3cfeae4cf6c9..66e8c8736d52 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2e9084a79607964c845941de92d7d71d
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2
deleted file mode 100644
index 0b499087d47b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3
deleted file mode 100644
index 50ccb847a2d8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for irqbalance
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a27bb1d164ada91a58f746ed5f6f5d57
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1
index 6afbcb1cecfa..f0e7484984f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3c916239c1270ad52d4b6ac3ce33d294
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2
index 10a121b2cf01..73b3a488f5de 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3c916239c1270ad52d4b6ac3ce33d294
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3
index 6f186a0fdfb7..872e62e06f91 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=af3b8db5f278f03507e5137cb3340b4c
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180701-r1
new file mode 100644
index 000000000000..f3853b0deb9e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for irqbalance
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=af3b8db5f278f03507e5137cb3340b4c
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999 b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
index 6e0290e1a802..7f2f24bab242 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=af3b8db5f278f03507e5137cb3340b4c
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2
deleted file mode 100644
index 3325584186cb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3
deleted file mode 100644
index 6c1fcbe17ca7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for jabber
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=feeb3adf2aed060e61021b1b8d4fe486
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1
index 12915c4017d8..6277912bbaac 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=34758749f35dc4796ad05b476890a2b5
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2
index 66b0e8fb16f9..98e1605aed1d 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=34758749f35dc4796ad05b476890a2b5
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3
index 6630495a9d59..becd8e4076f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c52127cdd3ec4cc51af324923f5f2e99
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180701-r1
new file mode 100644
index 000000000000..13ee3462928f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for jabber
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c52127cdd3ec4cc51af324923f5f2e99
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-9999 b/metadata/md5-cache/sec-policy/selinux-jabber-9999
index c74add3a02ca..ff80493581d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-9999
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c52127cdd3ec4cc51af324923f5f2e99
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2
deleted file mode 100644
index 1d4ef22dc55d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3
deleted file mode 100644
index 50d700b18204..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20170805-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fff7767d9afab9952412bfb1eadfea0d
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1
index aab6facaa61d..cec4b2eca7ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=59007a0909d3f136d900b63f3fffd425
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2
index 2ba377efa6ed..e6c60a7f305e 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=59007a0909d3f136d900b63f3fffd425
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3
index 47af2a63ff54..de7c23940fdf 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180114-r3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d89c1a6702a8c294e7ae2c5e0017767e
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-java-2.20180701-r1
new file mode 100644
index 000000000000..b6205ac6ae51
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for java
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d89c1a6702a8c294e7ae2c5e0017767e
diff --git a/metadata/md5-cache/sec-policy/selinux-java-9999 b/metadata/md5-cache/sec-policy/selinux-java-9999
index 81861737b394..ab1000ce95f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-9999
+++ b/metadata/md5-cache/sec-policy/selinux-java-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d89c1a6702a8c294e7ae2c5e0017767e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2
deleted file mode 100644
index 77cd24ebdf11..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3
deleted file mode 100644
index b1173f20ec57..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdeconnect
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=47173376aaa8db77c37cd88e89e6df7e
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1
index ab8fec39fa1c..7dd72d38918b 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=651ef1f5ece84e1685394ad34ec8f3c3
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2
index 1b7eb2bd819c..f80840430f69 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=651ef1f5ece84e1685394ad34ec8f3c3
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3
index b970aac5338e..de2bccf69aff 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fd051d625715e0a5b1f18baca3bd2b1b
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180701-r1
new file mode 100644
index 000000000000..98e21fbd4096
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kdeconnect
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=fd051d625715e0a5b1f18baca3bd2b1b
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
index 65ce98b25804..7c691c333f19 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fd051d625715e0a5b1f18baca3bd2b1b
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2
deleted file mode 100644
index 8505dc0fdece..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3
deleted file mode 100644
index 25f334b80335..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kdump
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=66d8d30142876aa65de0db9dd9b56e38
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1
index 4d9413f3b446..c68bf7cc5172 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f91889e09fd5527f5ced50f1bfa5e437
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2
index 23faebf1e288..e96d3e0b60cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f91889e09fd5527f5ced50f1bfa5e437
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3
index 18c56699ab1f..72d6ae61bfe1 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=def43a861057305a3b980b6e7bac9897
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180701-r1
new file mode 100644
index 000000000000..2ee8343326de
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kdump
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=def43a861057305a3b980b6e7bac9897
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-9999 b/metadata/md5-cache/sec-policy/selinux-kdump-9999
index 010cdcc4257a..359285b71a4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=def43a861057305a3b980b6e7bac9897
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2
deleted file mode 100644
index 5ff91577838f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3
deleted file mode 100644
index afa5676f2066..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerberos
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=70b6e2280c4e0c84428b1d6be192eed8
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1
index 98e7fa49820c..ff33f4b76560 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0b51410542cee82130dc4a336712b04f
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2
index aad94c6e7001..bb150f1ba5e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0b51410542cee82130dc4a336712b04f
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3
index 86a58480d232..3df293dcbb8f 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0b321567d5abb46b12244614e8c4bd4a
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180701-r1
new file mode 100644
index 000000000000..bb76f8cf9ead
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kerberos
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0b321567d5abb46b12244614e8c4bd4a
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-9999 b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
index f82fe2f31901..0c2f5651a5b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0b321567d5abb46b12244614e8c4bd4a
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2
deleted file mode 100644
index d5341d6f70c6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3
deleted file mode 100644
index fec543f2bac2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kerneloops
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f276f52da59ed5734254ddaaecadd680
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1
index 94dddfdfbca0..25cdeab67905 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=919a9750c5c2631dac2fe956025e2379
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2
index ce5434c58a90..153282d7cc48 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=919a9750c5c2631dac2fe956025e2379
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3
index f8d1a81ca4fa..36b7d248f64e 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=da940ff2bce48ddf5601dfce609c4871
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180701-r1
new file mode 100644
index 000000000000..09588028df88
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kerneloops
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=da940ff2bce48ddf5601dfce609c4871
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999 b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
index 72a69cb592ea..a5ed87a0a71f 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=da940ff2bce48ddf5601dfce609c4871
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2
deleted file mode 100644
index b3e1d14a9494..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3
deleted file mode 100644
index 16ba8c9868e3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kismet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e0b1149aec3465dbcdd60a08265cd917
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1
index 9a599c0cb509..77dd00a67e80 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3e77f01e5e871ca0415b92813c3fbcc4
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2
index 9e17b7f2a8b7..42bbb41f0fb9 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3e77f01e5e871ca0415b92813c3fbcc4
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3
index 0982fca29f47..9ddcf3a0b8e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29dfc361044ea542d6168237837092e0
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180701-r1
new file mode 100644
index 000000000000..ae5cb850d22f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kismet
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=29dfc361044ea542d6168237837092e0
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-9999 b/metadata/md5-cache/sec-policy/selinux-kismet-9999
index c29f1a400cf0..89e11df7a854 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29dfc361044ea542d6168237837092e0
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2
deleted file mode 100644
index e8614b642dfa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3
deleted file mode 100644
index aa1928a96b08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ksmtuned
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0a48b5a322f8c23add0461f35aca9ceb
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1
index dac33103aa5f..571e8da640f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a9be2f58cb9c42de31456de507e6dff7
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2
index f867a4273d15..7408bff2081f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a9be2f58cb9c42de31456de507e6dff7
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3
index c6c6150dfce1..1c7b2b28d31d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b5ee2ab24f2b625c0c1386458be011b
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180701-r1
new file mode 100644
index 000000000000..9c3acbf53ff6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ksmtuned
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6b5ee2ab24f2b625c0c1386458be011b
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
index f5dfb4ec5364..c2b5b31f8ee7 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b5ee2ab24f2b625c0c1386458be011b
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2
deleted file mode 100644
index 3938c978e969..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3
deleted file mode 100644
index 6e76cacb710e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for kudzu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b6c05c39d2c83ed6ff219a1dc8249959
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1
index 487ca8a41b25..fdd8f85b0e9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=311539ff8d916f158f8abf7372f76641
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2
index e14efa36199d..98eafd90886a 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=311539ff8d916f158f8abf7372f76641
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3
index 02bebf9f0381..cf4aaf6c908f 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=eb0352c8b6e442dda020748f068b414f
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180701-r1
new file mode 100644
index 000000000000..b01efafb5845
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for kudzu
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=eb0352c8b6e442dda020748f068b414f
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-9999 b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
index 47de2126137f..724ba81bc550 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=eb0352c8b6e442dda020748f068b414f
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2
deleted file mode 100644
index 38507acfa873..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3
deleted file mode 100644
index 5574c8f1d8e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ldap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9dc8124d25474f761b45e0bde89b3c33
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1
index 46893fc212f4..35d7bd5a5c42 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=98a86b4bca43020cdff8260ef234faa2
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2
index 4dc96ebd2c28..42fdd5d63853 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=98a86b4bca43020cdff8260ef234faa2
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3
index da021d92c58d..3446a80f081e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cf737ef75b7329a9358db73af259c306
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180701-r1
new file mode 100644
index 000000000000..1e851c0d3be4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ldap
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=cf737ef75b7329a9358db73af259c306
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-9999 b/metadata/md5-cache/sec-policy/selinux-ldap-9999
index 7cced8e69ff6..f01bfde274f6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cf737ef75b7329a9358db73af259c306
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2
deleted file mode 100644
index 7f78ec60d1fd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3
deleted file mode 100644
index dca5a76f217a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for links
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=270e53f02e92c17d14a9197e01fa34c4
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1
index 63d3dfcd5554..578b54b0320f 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=503fe00e40af900174dc71617206626e
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2
index b6e6143ad66b..670a70e311ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=503fe00e40af900174dc71617206626e
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3
index fa99eb3e391d..02de3188ddb0 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e4d0045a7bf5430674049b2b755f82b3
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-links-2.20180701-r1
new file mode 100644
index 000000000000..61baeb1865a6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for links
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e4d0045a7bf5430674049b2b755f82b3
diff --git a/metadata/md5-cache/sec-policy/selinux-links-9999 b/metadata/md5-cache/sec-policy/selinux-links-9999
index e696ab412e88..c5585c38f264 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-9999
+++ b/metadata/md5-cache/sec-policy/selinux-links-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e4d0045a7bf5430674049b2b755f82b3
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2
deleted file mode 100644
index e609da072f37..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3
deleted file mode 100644
index a4b2e00a3344..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lircd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c67e625e78657d923290935a8b912e73
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1
index 06b1b7c2f0bc..4bfb2b6040d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=242fd5451b277eb2e2bb4195b72e66a3
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2
index 3779419e4ee7..c8d54c351af7 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=242fd5451b277eb2e2bb4195b72e66a3
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3
index 4eb10a7278d4..7e6f891fc791 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0360cb65ebeccfcd36244b9bc2f188cc
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180701-r1
new file mode 100644
index 000000000000..c19ddd650845
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lircd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0360cb65ebeccfcd36244b9bc2f188cc
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-9999 b/metadata/md5-cache/sec-policy/selinux-lircd-9999
index 7beec071deb1..6ffa46538a1f 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0360cb65ebeccfcd36244b9bc2f188cc
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2
deleted file mode 100644
index 4c7c7b77cfc1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3
deleted file mode 100644
index 9a0bf02021f2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for loadkeys
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=991ae45b1c52a2bfccc4ba1299ecb877
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1
index f61b155d01ee..1f31615fce2d 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bf18e03cc8fb1577ee42ddb59a3a9fed
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2
index 1dda74f07d1b..5027174de6e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bf18e03cc8fb1577ee42ddb59a3a9fed
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3
index 4ef6d86ae30f..a8fe3c54bf0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1d931e63ce8090e4fc06ca3680343039
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180701-r1
new file mode 100644
index 000000000000..e2d6c972a134
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for loadkeys
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1d931e63ce8090e4fc06ca3680343039
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999 b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
index 7b7e3b9e0b0e..9f24265375d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1d931e63ce8090e4fc06ca3680343039
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2
deleted file mode 100644
index 415e7bf21c0a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3
deleted file mode 100644
index ec984b45c776..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lockdev
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1ba8a28ce302d95127d13dc29e91b073
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1
index c5393890bbca..1b52a9536bbd 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ae50a874e0fe261bb3b2ece1f0277984
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2
index 2a4f4e50c171..4dab725a74d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ae50a874e0fe261bb3b2ece1f0277984
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3
index 5bdcbaa15803..8dabcc417745 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=540c3fe58eab97f94cc12d529496207d
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180701-r1
new file mode 100644
index 000000000000..dc342b2f84fb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lockdev
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=540c3fe58eab97f94cc12d529496207d
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-9999 b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
index c4cd8b89ea5d..73a5552479d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=540c3fe58eab97f94cc12d529496207d
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2
deleted file mode 100644
index b7110ace5718..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3
deleted file mode 100644
index 7bd0b6fe05e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logrotate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=24f73669ab90c6398493a1e690744a43
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1
index 4d64a35d8e96..86e69715feb2 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3b2b40af51310cac1005c47d9cc66f45
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2
index bb3973a88696..c3d563eb0a37 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3b2b40af51310cac1005c47d9cc66f45
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3
index 250556e0811f..eefbfc6a9f3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a4064aa954d2c75e342af3bddbdf64d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180701-r1
new file mode 100644
index 000000000000..70952ece7aac
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logrotate
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a4064aa954d2c75e342af3bddbdf64d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-9999 b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
index 431f0bacd60d..ab431a51cb40 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a4064aa954d2c75e342af3bddbdf64d8
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2
deleted file mode 100644
index 0d18d4c3e7db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3
deleted file mode 100644
index 3d2eea09b71b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logsentry
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e2608afb6bdb2f15517fd3ef7d46eb72
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1
index 06643d94cb44..ad9f4413db72 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=60da0ea7a8d59fc0b21de04fd2b234ab
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2
index 3d36ff1765b8..db680e6b27db 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=60da0ea7a8d59fc0b21de04fd2b234ab
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3
index e7fd604ed6d6..fbf8946374a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=af8f279f7769dd6ecafa2d579f3c84ee
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180701-r1
new file mode 100644
index 000000000000..b47367d189b4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logsentry
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=af8f279f7769dd6ecafa2d579f3c84ee
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-9999 b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
index b7cb9321e233..52484720453d 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=af8f279f7769dd6ecafa2d579f3c84ee
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2
deleted file mode 100644
index 6fc2a99b17ef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3
deleted file mode 100644
index 162cbcfb55ba..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for logwatch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f3907fcadadd35acc3a92cfb74152a31
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1
index 2da1abdf9ef2..f7a409c55659 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25f70d1d207a11270fa25d64fdc8cea1
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2
index f6e96db0a2a1..2750bd66c541 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25f70d1d207a11270fa25d64fdc8cea1
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3
index 52bbfd169ee8..248bd3e727a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=72b84f4747d4fe0c37aa9d86e00c8048
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180701-r1
new file mode 100644
index 000000000000..77cefe5b5100
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for logwatch
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=72b84f4747d4fe0c37aa9d86e00c8048
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-9999 b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
index 3624a49508e0..1b825e535472 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=72b84f4747d4fe0c37aa9d86e00c8048
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2
deleted file mode 100644
index 26405e10ac93..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3
deleted file mode 100644
index fe33c35dee13..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for lpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=66721998d2059f3439efabb0924c6e4e
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1
index 5e5839c75895..1dfa9fa41487 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fbf4b9650376f4a9992ee855516dc888
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2
index 95aef7d0f793..1df9c976e8cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fbf4b9650376f4a9992ee855516dc888
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3
index 912ab1c7d234..6566c85448be 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=23d06c12705d6ecdddfffb4f7d3e4223
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180701-r1
new file mode 100644
index 000000000000..e7df539034c4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for lpd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=23d06c12705d6ecdddfffb4f7d3e4223
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-9999 b/metadata/md5-cache/sec-policy/selinux-lpd-9999
index dc195150a57a..a06ada9c1a1d 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=23d06c12705d6ecdddfffb4f7d3e4223
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2
deleted file mode 100644
index f91895b7c834..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3
deleted file mode 100644
index 1db7642ad887..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mailman
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7c1d42bd3a89eb5b3f56ddc354af515e
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1
index 0f41dd6a6ff2..aaa2431bb48b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ab099a73e64e87d1b10d1b51dfa85692
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2
index 2610832beec5..57c7816e9e51 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ab099a73e64e87d1b10d1b51dfa85692
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3
index cd418d6a1228..119154ad5648 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b053cda2d6e2149f78b55d86fe7526f6
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180701-r1
new file mode 100644
index 000000000000..53b5ff15301c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mailman
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b053cda2d6e2149f78b55d86fe7526f6
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-9999 b/metadata/md5-cache/sec-policy/selinux-mailman-9999
index fabe41c903fa..ce1d245778c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b053cda2d6e2149f78b55d86fe7526f6
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2
deleted file mode 100644
index d7730475bcc9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3
deleted file mode 100644
index 2d25ae594618..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for makewhatis
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3584f37b568898e0a2a66221187574b5
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1
index 259ccdf627e2..327b8bf3318a 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a91eea9058e94cc475fc36bbc884fd00
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2
index 555203b3d20c..0fa58f8bac86 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a91eea9058e94cc475fc36bbc884fd00
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3
index 91ecd7721f98..fa6f0da9ea17 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e43e906a6f5b319d4c77b6c7aebe387
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180701-r1
new file mode 100644
index 000000000000..d66bd13be63c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for makewhatis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=9e43e906a6f5b319d4c77b6c7aebe387
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999 b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
index 971e69e379a6..408508753b01 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e43e906a6f5b319d4c77b6c7aebe387
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2
deleted file mode 100644
index 55e2fbe582ea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3
deleted file mode 100644
index 1b65bad5beb1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mandb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=785ceb7693121b04004b0dc21becb399
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1
index 1a89cf6b0adc..3a9401dcaa8b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9ec7537e7c70edf403eb8345d7d3824a
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2
index 9cd25cbfc82a..37b76d38e109 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9ec7537e7c70edf403eb8345d7d3824a
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3
index 0c9533d1371c..4759c3d6c0b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8240c2210d6a4504a5863c70b0f5e042
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180701-r1
new file mode 100644
index 000000000000..7fa4f4eb574b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mandb
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8240c2210d6a4504a5863c70b0f5e042
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-9999 b/metadata/md5-cache/sec-policy/selinux-mandb-9999
index a3ca7c5ab0e1..6b994afb4e14 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8240c2210d6a4504a5863c70b0f5e042
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2
deleted file mode 100644
index c8f9e37db1c3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3
deleted file mode 100644
index 29fccc049a89..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mcelog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d0084a5493553ba99bdbf47a7e96302f
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1
index 3421e40fe2a1..affabfc1fd7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=390ee64dd6b889bf9793436f01ecda54
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2
index 65be4389281c..07f93581d277 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=390ee64dd6b889bf9793436f01ecda54
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3
index e34f550ce30e..c07b738f3911 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b7ea0b8e3accd00cc9dfffa319837ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180701-r1
new file mode 100644
index 000000000000..6884072a73b0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mcelog
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b7ea0b8e3accd00cc9dfffa319837ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-9999 b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
index 261a3f9d5b93..0bfdc0efa570 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b7ea0b8e3accd00cc9dfffa319837ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2
deleted file mode 100644
index 57cd89fa391a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3
deleted file mode 100644
index c27547f87f69..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for memcached
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e0b136c57886a9b86b99d9d9623a273b
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1
index da7182413a88..fbf6f7f79f90 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=07e7115aa10f24a66447e045e08d9fd4
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2
index a408caef2e0c..c1a29c645fcd 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=07e7115aa10f24a66447e045e08d9fd4
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3
index 3ce30a506342..30c37a426273 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c21960e4ec5eaf04977b1016b49b3231
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180701-r1
new file mode 100644
index 000000000000..e4deee0f152d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for memcached
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c21960e4ec5eaf04977b1016b49b3231
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-9999 b/metadata/md5-cache/sec-policy/selinux-memcached-9999
index 3976c2010f18..aa0bb435fd7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-9999
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c21960e4ec5eaf04977b1016b49b3231
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2
deleted file mode 100644
index b39c8cdc557b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3
deleted file mode 100644
index f2960aa5394e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for milter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ce92d19be9e1a9db38889fe0b8dc2131
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1
index 2bcbd6392de5..d9535bb6393a 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29d18c21855843dc5997498335610804
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2
index 23993b49418f..24c52d652a9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29d18c21855843dc5997498335610804
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3
index 5a3243b0b819..cef2fa81fa39 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fcde88de4669f1600ef3c4ab9dc0044a
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-milter-2.20180701-r1
new file mode 100644
index 000000000000..a97b2839de3f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for milter
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=fcde88de4669f1600ef3c4ab9dc0044a
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-9999 b/metadata/md5-cache/sec-policy/selinux-milter-9999
index 7192e29b7338..a7446184dabe 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-9999
+++ b/metadata/md5-cache/sec-policy/selinux-milter-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fcde88de4669f1600ef3c4ab9dc0044a
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2
deleted file mode 100644
index eae6446b972f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3
deleted file mode 100644
index 450fb853a7f5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for modemmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=079ca7c7f97dbf45a7bda414f2c13a80
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1
index 154094f4b419..cf21a335e851 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=918676dbb5d5bd3653ebba8984440ef0
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2
index 07d4b22a60cf..a8032ea9c8dc 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=918676dbb5d5bd3653ebba8984440ef0
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3
index 73fba63266ea..e745ecdb071b 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=62d09d10e094c215f561e9f6f53ef5a2
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180701-r1
new file mode 100644
index 000000000000..8fa851c8cf67
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for modemmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=62d09d10e094c215f561e9f6f53ef5a2
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999 b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
index dff544ff73b4..8a01c838a32c 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=62d09d10e094c215f561e9f6f53ef5a2
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2
deleted file mode 100644
index fc9373c95730..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3
deleted file mode 100644
index d0413902cf0c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mono
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f80cc5fedaf3064849f66d2a077dfd1c
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1
index 957f3c8f3b0a..21144e170b7f 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=663ab77a74869b35729e29d6d181cc85
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2
index f91016e17638..7b292858662b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=663ab77a74869b35729e29d6d181cc85
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3
index 304b85ca1784..e9fc2cc87217 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=30bed760aebba0c1cb2f5130edc50dc4
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mono-2.20180701-r1
new file mode 100644
index 000000000000..04385edd044c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mono
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=30bed760aebba0c1cb2f5130edc50dc4
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-9999 b/metadata/md5-cache/sec-policy/selinux-mono-9999
index 56f8d0925724..9426383be994 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mono-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=30bed760aebba0c1cb2f5130edc50dc4
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2
deleted file mode 100644
index 61d60ce0976c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3
deleted file mode 100644
index eb69a2d89178..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20170805-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mozilla
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=30aa93e21e5e4d5f73f0c66ef0914cb0
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1
index 5e07d26d0889..7fbf5b985214 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c98091bf5cacd947b2defe71d95cc747
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2
index 55249c6bc84b..767232756bb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c98091bf5cacd947b2defe71d95cc747
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3
index 4d1b1158d395..792a2f528f26 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180114-r3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5c41088792ccce3bc0e5403d32b70c10
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180701-r1
new file mode 100644
index 000000000000..1ad8dd186ff7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mozilla
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=5c41088792ccce3bc0e5403d32b70c10
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-9999 b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
index 9f8c59724bee..c62b1226d247 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5c41088792ccce3bc0e5403d32b70c10
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2
deleted file mode 100644
index dd7500bf590c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3
deleted file mode 100644
index f13cc8f9f556..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f58be8f0885e5b3e7f0f9c5b0e7e0fa5
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1
index 5e4f447c58c4..b0a6c6edbebb 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=17b7f2030f3c3c7afcd9daa2aa3afdee
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2
index bad69c021234..615c0946ea6d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=17b7f2030f3c3c7afcd9daa2aa3afdee
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3
index d6339107a55e..0ab9d14c67d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6fad9b58892effd16c8c9f09f3ce0931
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180701-r1
new file mode 100644
index 000000000000..4629cc6509ce
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mpd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6fad9b58892effd16c8c9f09f3ce0931
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-9999 b/metadata/md5-cache/sec-policy/selinux-mpd-9999
index a06d14f90737..486670a069a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6fad9b58892effd16c8c9f09f3ce0931
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2
deleted file mode 100644
index 1e6cfbd26a22..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3
deleted file mode 100644
index 2c087922be3a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20170805-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mplayer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7c32892e1a9454d5100f67568b45a4c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1
index 4dc306df12cb..3801d72487a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0ba424bbb9d289f45b92025ccb9cf5ad
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2
index 65ecdd5ed75b..6cc7354fd7dc 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0ba424bbb9d289f45b92025ccb9cf5ad
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3
index a7a65286802e..9fc238de35f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180114-r3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bedc188a84f066ce2f8296a0e0552080
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180701-r1
new file mode 100644
index 000000000000..b7840081c2f7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mplayer
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=bedc188a84f066ce2f8296a0e0552080
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-9999 b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
index e89d9f326c93..cf5afba335f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bedc188a84f066ce2f8296a0e0552080
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2
deleted file mode 100644
index d91af4744427..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3
deleted file mode 100644
index 0bc442bc6b27..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mrtg
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f5744d781869170fbca215b5f40ae8b6
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1
index 8251c712c4ea..f2be5f22675c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a0a78a0ede9ec2ec73251040cf6d136a
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2
index f44a33321950..7669e415d5da 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a0a78a0ede9ec2ec73251040cf6d136a
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3
index 7194c0276f28..3599fbd8af23 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d2ada5497f9a36ce81c96551f6ab00ab
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180701-r1
new file mode 100644
index 000000000000..59c061b11318
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mrtg
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d2ada5497f9a36ce81c96551f6ab00ab
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-9999 b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
index f9d4a2e46a5d..74e1261d5838 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d2ada5497f9a36ce81c96551f6ab00ab
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2
deleted file mode 100644
index eb1732552eb3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3
deleted file mode 100644
index 59f5152f4b71..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for munin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0417c4c119b7c6779d29105162249c15
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1
index 48b76c81a42a..a06df4ee841c 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d3a04b37493428ba2b218b07b122280c
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2
index 8c9c480d8b98..85584fb1c00d 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d3a04b37493428ba2b218b07b122280c
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3
index 56515542bc50..312b936fb0ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6fd29fa43f603e772ab942da82094229
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-munin-2.20180701-r1
new file mode 100644
index 000000000000..e6d607582b01
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for munin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6fd29fa43f603e772ab942da82094229
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-9999 b/metadata/md5-cache/sec-policy/selinux-munin-9999
index 40f7fffdff4d..e4bba35a9798 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-munin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6fd29fa43f603e772ab942da82094229
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2
deleted file mode 100644
index f46e0fd9c7f9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3
deleted file mode 100644
index d1ad8c4b227b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mutt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a0f577d89e133fd991d52839b2514c5d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1
index 69d9c35c0a3b..9bc1dd55c7d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5193ba41111a2b19cf428e307b77d836
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2
index 5ea4e939b2bd..f91a01d9f346 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5193ba41111a2b19cf428e307b77d836
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3
index 97fd91a00393..a10bd0ba6931 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6249658f45fa8072f2bbf5656d3ac8c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180701-r1
new file mode 100644
index 000000000000..53898942211a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mutt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6249658f45fa8072f2bbf5656d3ac8c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-9999 b/metadata/md5-cache/sec-policy/selinux-mutt-9999
index ae37da3a0f80..bb53c5ee5f28 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6249658f45fa8072f2bbf5656d3ac8c0
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2
deleted file mode 100644
index f8dc4b1f384c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3
deleted file mode 100644
index 7e50932c803f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for mysql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d4d38cd6464f081b9099d1570f821312
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1
index ef8a48046747..2807ed2b789a 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3caa5c1ca848aeb4d0e717e736271b67
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2
index c47cde056de8..536150429e30 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3caa5c1ca848aeb4d0e717e736271b67
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3
index eb14238ae0b8..c4d257c4435d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ee9fad3bdc49d5afcfe334655ef4c702
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180701-r1
new file mode 100644
index 000000000000..dfe3a23564fc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for mysql
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ee9fad3bdc49d5afcfe334655ef4c702
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-9999 b/metadata/md5-cache/sec-policy/selinux-mysql-9999
index 076162e545ee..f9b88dbae08a 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ee9fad3bdc49d5afcfe334655ef4c702
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2
deleted file mode 100644
index 36dadfed412a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3
deleted file mode 100644
index 0076a56ff71c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nagios
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=73eb9c6763a4fc07a27d95cae67f1b86
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1
index fdebe38ed82f..8b330f7a2d9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f9545cdcac26cb140b7f5ae9a7086d13
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2
index f01468291a89..bd02df029044 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f9545cdcac26cb140b7f5ae9a7086d13
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3
index 11ce011aa1d9..53aec3b67d50 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2283fe78d63c9f12487940533f9f2305
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180701-r1
new file mode 100644
index 000000000000..cce28b6f9397
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nagios
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2283fe78d63c9f12487940533f9f2305
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-9999 b/metadata/md5-cache/sec-policy/selinux-nagios-9999
index 0d432ecc4aea..f92ea8e8ba39 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2283fe78d63c9f12487940533f9f2305
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2
deleted file mode 100644
index b9614562b262..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3
deleted file mode 100644
index d82b2970bf3c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ncftool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=988cae489d29920e06a3b44f96fce612
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1
index e31058fec8f7..9cce7697b738 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48f5dee22a4d14eb2c8b714bdf7b41f2
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2
index c2469c026fcb..f64b061c34b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48f5dee22a4d14eb2c8b714bdf7b41f2
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3
index a2bf25fc655c..db84a61cb60c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=495a6aff7397f4078e208fc0cf2953b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180701-r1
new file mode 100644
index 000000000000..9ec83082261c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ncftool
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=495a6aff7397f4078e208fc0cf2953b0
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-9999 b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
index 9766a3379da5..1ac3ab9f1ac9 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=495a6aff7397f4078e208fc0cf2953b0
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2
deleted file mode 100644
index 04608efc5f80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3
deleted file mode 100644
index e3912abad981..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3b67850db3423fc1218028b39366942c
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
index 471e65e953fd..7f1b01c0cd35 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8befb8f2d28a7925d288d8a5afb1e2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
index b55e0a8f2b03..9a99798b298e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8befb8f2d28a7925d288d8a5afb1e2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
index b19b51f09942..a95d27eccdb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r1
new file mode 100644
index 000000000000..1cc025a2e256
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nessus
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-9999 b/metadata/md5-cache/sec-policy/selinux-nessus-9999
index 862b777c509a..1e4930e8cf0d 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2
deleted file mode 100644
index 3c01e4c0b83d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3
deleted file mode 100644
index 01d8a8f04bab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for networkmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=46262ce9eb57c7158b717b6dc2f174a6
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1
index 16d677d32bc7..a97aa9bcc17e 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8bc7ae25d6813f6995f242ae5beaef9f
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2
index 07b2da8a8057..0f03b7eeb09b 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8bc7ae25d6813f6995f242ae5beaef9f
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3
index d142a537f9e9..491e62d691ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=afac6d957c45eade26bb7970bcbb29d8
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180701-r1
new file mode 100644
index 000000000000..320a89b42cb6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for networkmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=afac6d957c45eade26bb7970bcbb29d8
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999 b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
index 8c3fae08fce2..f1bad01b4f36 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=afac6d957c45eade26bb7970bcbb29d8
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2
deleted file mode 100644
index 7015d8f2b45b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3
deleted file mode 100644
index 91750f14d523..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nginx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a8cf95949ea5f5c634b716f97d0c98a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1
index f61066993d3e..113ed343bbcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=07158cfc6cba437e2e96820e76bc8a9d
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2
index a6f225feb9c7..adcb031e00d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=07158cfc6cba437e2e96820e76bc8a9d
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3
index af192eb7b47d..4f03c9a49721 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2e8b1ecba3b962095d92ac80c08b05dc
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180701-r1
new file mode 100644
index 000000000000..4c5d0641d03a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nginx
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2e8b1ecba3b962095d92ac80c08b05dc
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-9999 b/metadata/md5-cache/sec-policy/selinux-nginx-9999
index e73ac7b85876..a00f1e6162ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2e8b1ecba3b962095d92ac80c08b05dc
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2
deleted file mode 100644
index d5524906da75..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3
deleted file mode 100644
index bbf7f8efca3c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nslcd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e57adeb2b36865fa2517aed9122c8027
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1
index 84c046f041ca..13a4ee3a6cf2 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e8f3440ae3c171e31f0981154b80ef4c
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2
index f184b4352671..6719f22c9e8c 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e8f3440ae3c171e31f0981154b80ef4c
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3
index fecfe272b960..4e58bafbfe87 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=400c09df7ef43996be4acd6f09ca8ed8
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180701-r1
new file mode 100644
index 000000000000..8d8494d99016
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nslcd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=400c09df7ef43996be4acd6f09ca8ed8
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-9999 b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
index bce84415d367..6a83fe837796 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=400c09df7ef43996be4acd6f09ca8ed8
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2
deleted file mode 100644
index 74ffec15d62f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3
deleted file mode 100644
index 447a9fd75dcb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntop
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ee21d1422bcb821ebf2ae6fd5111740c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1
index 9a38ab8ad713..d3fc1d78406b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6af8712042364f42527a0791e848c001
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2
index 9e8bd75cfdf1..43fa6b3719e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6af8712042364f42527a0791e848c001
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3
index c3378808c403..306192f43caf 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b15dd63a5af14d7e0864936aba9df9f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180701-r1
new file mode 100644
index 000000000000..773522c4757b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ntop
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b15dd63a5af14d7e0864936aba9df9f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-9999 b/metadata/md5-cache/sec-policy/selinux-ntop-9999
index 51db4fa551e0..446428893828 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b15dd63a5af14d7e0864936aba9df9f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2
deleted file mode 100644
index 42292c75943a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3
deleted file mode 100644
index 9a01b89d5e87..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ntp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5a391977cf8586bdd89b145ab11a1cde
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1
index c9d5a724df24..b4c6d0cb3c56 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fb140c5b09c21348b1d112542bbdaa6a
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2
index 2acf3d7b805e..a54a05e5d812 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fb140c5b09c21348b1d112542bbdaa6a
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3
index d44baf3960c9..89964385b9d9 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=37b9d936d3cd91d3834f211048090945
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180701-r1
new file mode 100644
index 000000000000..737a52f1869c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ntp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=37b9d936d3cd91d3834f211048090945
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-9999 b/metadata/md5-cache/sec-policy/selinux-ntp-9999
index 4d2aaea7ba43..9fb09c8759d8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=37b9d936d3cd91d3834f211048090945
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2
deleted file mode 100644
index 7bf867727767..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3
deleted file mode 100644
index be61db2d360e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nut
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=81889595da7c01fce6212db20c733927
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1
index e6acae3967a7..fcc6bd6063fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=52ca5c03e472d148ec8bf53a65d3120c
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2
index 4d5772d2f026..dbf1da2432ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=52ca5c03e472d148ec8bf53a65d3120c
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3
index cd255ed4dbfc..c1d0d274ac77 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7b4f7bce8bb6b4a25f8faf96a4d5d333
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nut-2.20180701-r1
new file mode 100644
index 000000000000..a68e4fc18f10
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nut
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=7b4f7bce8bb6b4a25f8faf96a4d5d333
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-9999 b/metadata/md5-cache/sec-policy/selinux-nut-9999
index 17ac2a3b9553..ab4efbd3a45e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nut-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7b4f7bce8bb6b4a25f8faf96a4d5d333
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2
deleted file mode 100644
index 6c391d2df307..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3
deleted file mode 100644
index 9700f8c6d842..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nx
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5cb12a458b775f2bec0420875e76ed7f
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1
index fa150626a4e7..208827bb5fa7 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3cef6fcc5b4ff3db68a30899e517d924
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2
index e82352406c8e..6189f834c845 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3cef6fcc5b4ff3db68a30899e517d924
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3
index 9c9fd735eb19..8514dafcba30 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=08ac0dea04d3b73191ab7d7ff535e825
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nx-2.20180701-r1
new file mode 100644
index 000000000000..6b513bab4541
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for nx
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=08ac0dea04d3b73191ab7d7ff535e825
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-9999 b/metadata/md5-cache/sec-policy/selinux-nx-9999
index f0e321214776..3efe15231947 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=08ac0dea04d3b73191ab7d7ff535e825
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2
deleted file mode 100644
index 8e7c15f1a7af..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3
deleted file mode 100644
index f4ba1375c80a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oddjob
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=54d228be470d4d2ddb52d194e9d1a714
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1
index 6666a1946140..4a88d3c6d1ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2227b4a5cfe003485d500f633f98a369
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2
index 06cda55c6967..7e843c10bf21 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2227b4a5cfe003485d500f633f98a369
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3
index 37eda612de79..3e92fbce63ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=19f4b43aabb8845fbaaed0ef11e23234
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180701-r1
new file mode 100644
index 000000000000..95c22f39519a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for oddjob
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=19f4b43aabb8845fbaaed0ef11e23234
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-9999 b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
index b401d681490c..858d7f4a9e32 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=19f4b43aabb8845fbaaed0ef11e23234
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2
deleted file mode 100644
index cf382d3b649b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3
deleted file mode 100644
index 2efa701f87da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for oident
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=57e1c619155c4164f4b84d1d161ae8e0
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1
index 254808a72a1e..921299a185d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dcf303e613f0f7a1c259dd80823bb780
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2
index e10a19ff6ed4..d10a45883259 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dcf303e613f0f7a1c259dd80823bb780
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3
index 7f8afdbc61a7..f68cc9f5b901 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ca4a3999304e06478f728acdd8a5a455
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-oident-2.20180701-r1
new file mode 100644
index 000000000000..c47077486f0a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for oident
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ca4a3999304e06478f728acdd8a5a455
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-9999 b/metadata/md5-cache/sec-policy/selinux-oident-9999
index 4c7dfed0cd43..0f10126d3551 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oident-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ca4a3999304e06478f728acdd8a5a455
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2
deleted file mode 100644
index 4cd859ba2b4c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3
deleted file mode 100644
index ceb03a575e05..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openct
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d14be6ccf4964c1e67605046805a34bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1
index f026f29527a4..31cc7d84bb42 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a4ce6f02dafa04dcb09df28ecfaa3735
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2
index 45481fc30bd1..f4ada7a7e8a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a4ce6f02dafa04dcb09df28ecfaa3735
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3
index 6932441f9491..6e8b9135493d 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b99c7fc3c33229da0072d76984ab5115
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-openct-2.20180701-r1
new file mode 100644
index 000000000000..4217826a18ba
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openct
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b99c7fc3c33229da0072d76984ab5115
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-9999 b/metadata/md5-cache/sec-policy/selinux-openct-9999
index ce11b0f28b3e..c754f575a97b 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openct-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b99c7fc3c33229da0072d76984ab5115
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2
deleted file mode 100644
index 3b0509473077..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3
deleted file mode 100644
index b2c74414e5a5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openrc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2ef1378be7c9ed9238e15f071aee79bd
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1
index 6351863b4bb6..2d2cd6811c18 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=70bcc83131cd0b2e53764ad9d5331a37
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2
index 09214319bdbf..26aeb1ea7797 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=70bcc83131cd0b2e53764ad9d5331a37
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3
index 1e9181797648..fbd4a3446697 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6071f5d601fd8acac400bba39e19c31e
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180701-r1
new file mode 100644
index 000000000000..e9c6db24da61
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openrc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6071f5d601fd8acac400bba39e19c31e
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-9999 b/metadata/md5-cache/sec-policy/selinux-openrc-9999
index 15d8c38272f6..0cff4bece8b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6071f5d601fd8acac400bba39e19c31e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2
deleted file mode 100644
index 3c295c565fbb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3
deleted file mode 100644
index 4375ca5598fb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for openvpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9a76456d66ec97f4a4d599dda92b5a6e
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1
index ef1dbb8d988f..331f8c9d8368 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=322d29f368abc5ce28c016b5256e7d0b
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2
index 4aa25fa5d1b5..c45a0e5c6f9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=322d29f368abc5ce28c016b5256e7d0b
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3
index 5d4b760125b8..3a10dadd91b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=611e863a2e3bce1f1ce82f8cad8f00e9
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180701-r1
new file mode 100644
index 000000000000..6bd95748ef35
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for openvpn
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=611e863a2e3bce1f1ce82f8cad8f00e9
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-9999 b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
index 12deb5a3044d..d7aa57c06bf8 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=611e863a2e3bce1f1ce82f8cad8f00e9
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2
deleted file mode 100644
index c4e21ac8426c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3
deleted file mode 100644
index a4ff15f819af..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pan
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e91e2d9f8819ae116f8d8731d2c06cec
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1
index d1171e310319..7910b3474b44 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f1626d93dbe556ccdddac1250afed73e
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2
index 9c56f835bf6e..fc5ebf372ccf 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f1626d93dbe556ccdddac1250afed73e
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3
index a4e3920edafe..e46274478ff9 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=062cad6cd2fbee94b96401b92a0edd9b
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-pan-2.20180701-r1
new file mode 100644
index 000000000000..8e197df59254
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pan
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=062cad6cd2fbee94b96401b92a0edd9b
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-9999 b/metadata/md5-cache/sec-policy/selinux-pan-9999
index 2e7b9df99569..f9947598c851 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pan-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=062cad6cd2fbee94b96401b92a0edd9b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2
deleted file mode 100644
index de889642b13a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3
deleted file mode 100644
index ffeb1e787360..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcmcia
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a165eab02b87d1e945e723441476f7ca
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1
index 8e0874ac10fd..7811dde9db18 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8f44a8e01aae81749191df25b5e6a592
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2
index da3402ba5bc9..6d4033d5691b 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8f44a8e01aae81749191df25b5e6a592
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3
index 91b84cee4241..65431045dfcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=450602904241cbc7df59e61795749e8b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180701-r1
new file mode 100644
index 000000000000..4e399489be37
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pcmcia
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=450602904241cbc7df59e61795749e8b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999 b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
index f2f024ca2eb6..da694d73e14a 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=450602904241cbc7df59e61795749e8b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2
deleted file mode 100644
index 351f86028bb4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3
deleted file mode 100644
index 0f357c4b2039..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pcscd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=060328425b60fa83c9ec7ff198c98adf
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1
index 5cd69de46a37..e930b390767e 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=188b72483f881830dc3a599343a0f141
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2
index cdf9770e1a20..b8bc8a89fc3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=188b72483f881830dc3a599343a0f141
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3
index 720a5a6111e3..d6a9332b90a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d4bbed6482cc6fd250e63311ec8e963e
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180701-r1
new file mode 100644
index 000000000000..856f75e3b808
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pcscd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d4bbed6482cc6fd250e63311ec8e963e
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-9999 b/metadata/md5-cache/sec-policy/selinux-pcscd-9999
index 55c94f667930..2f25e0caca2a 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d4bbed6482cc6fd250e63311ec8e963e
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2
deleted file mode 100644
index 6d9931b200dd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3
deleted file mode 100644
index e21814bfcc06..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for perdition
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=74b0ec50ffff1a6340ec34c2235b4d7f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
index 9829adf015e5..6d9a6f7cdfd6 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b5a699a1048ac9decc7b92c0a74076f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
index 81c8d72606b7..6874d77db13a 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b5a699a1048ac9decc7b92c0a74076f
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
index 9ac755586b83..551e33f0eed3 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r1
new file mode 100644
index 000000000000..9ea4d6e4af53
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for perdition
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-9999 b/metadata/md5-cache/sec-policy/selinux-perdition-9999
index 99bb351a6ef9..c9c9bee7828b 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-9999
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c85192d9deae2521b9203a9302b31509
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2
deleted file mode 100644
index 7ca7de580d08..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3
deleted file mode 100644
index 6254229ebb63..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for phpfpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=72a4d9183479a22fc7eecf2dc9e7ccc9
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1
index e12ad07c1764..e1763837ba64 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bdc2fa5832917634136f0fbec3b947ac
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2
index 88c762c7d0bc..fbe6c6e9ca13 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bdc2fa5832917634136f0fbec3b947ac
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3
index 9a51104e0963..9e1b6c9b4889 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1940f6c846e1240ac3ed479c1508cab1
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180701-r1
new file mode 100644
index 000000000000..67f140a5932a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for phpfpm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1940f6c846e1240ac3ed479c1508cab1
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999 b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
index 7c6c8b562b23..26ddf9b8a5a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1940f6c846e1240ac3ed479c1508cab1
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2
deleted file mode 100644
index 5272a63fee5b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3
deleted file mode 100644
index 5bbad2c4dfa0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for plymouthd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b773502ca8131faffd96967b5d0383eb
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1
index 32c1a87131fd..f382da16b27a 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d6f443724471cac38159e20113ef7952
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2
index c6972feb89f9..43cb81fd6093 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d6f443724471cac38159e20113ef7952
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3
index 34de3daea079..c723c3c1af19 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c082f353132b5b9abd9354e18adf9206
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180701-r1
new file mode 100644
index 000000000000..4e814f458e24
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for plymouthd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c082f353132b5b9abd9354e18adf9206
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999 b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
index fdd90a23357f..1dce4b3a1349 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c082f353132b5b9abd9354e18adf9206
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2
deleted file mode 100644
index 30928aaa64ff..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3
deleted file mode 100644
index a6685025cb71..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for podsleuth
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=18e00216631fb29b01bb518d81297d79
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1
index 2786ce55e38f..a3c9692380cc 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c69941bb4020c1416cdb047d7b444993
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2
index 07ea14042cbb..7b0541188409 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c69941bb4020c1416cdb047d7b444993
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3
index 8d900491baf7..c4f5d1d910b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=38629b51730a5bc7895c26c8644e5534
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180701-r1
new file mode 100644
index 000000000000..2cfe62a6e24c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for podsleuth
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=38629b51730a5bc7895c26c8644e5534
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999 b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
index cc6814c9c7a1..d507b2b1c8e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=38629b51730a5bc7895c26c8644e5534
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2
deleted file mode 100644
index 6caff8a23fe8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3
deleted file mode 100644
index 61e50fff1dc9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for policykit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=6d71c3bd020dd29292637b1f85fa792d
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1
index 7829ec5b441d..17fc1e390777 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6aa0aaf70d6386a935da8289a142af1c
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2
index 671558f1b38b..cf9d690ef973 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6aa0aaf70d6386a935da8289a142af1c
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3
index 1457f378a073..94733e7b0417 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6fa7319895fc508f6fe1a1c15e7ab393
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180701-r1
new file mode 100644
index 000000000000..5fd3a97c1a72
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for policykit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6fa7319895fc508f6fe1a1c15e7ab393
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-9999 b/metadata/md5-cache/sec-policy/selinux-policykit-9999
index 1215d6314cac..f381c550ce6a 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6fa7319895fc508f6fe1a1c15e7ab393
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2
deleted file mode 100644
index d51720626429..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3
deleted file mode 100644
index 9516752025c6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for portmap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ca4865a1af4d6df33233c8e4a52cb611
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1
index 523dba3db4f7..dba6a4a09c3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3dfd06019ee4723d0f313e0d83cb3d7
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2
index 783751aa95fa..a4a1156d41d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3dfd06019ee4723d0f313e0d83cb3d7
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3
index 52854e21bde8..80f033972101 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d00dd55591db67d154b738e235cc9ece
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180701-r1
new file mode 100644
index 000000000000..eca25e7ac45f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for portmap
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d00dd55591db67d154b738e235cc9ece
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-9999 b/metadata/md5-cache/sec-policy/selinux-portmap-9999
index c791d4c307c8..18fc7f9ecfda 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d00dd55591db67d154b738e235cc9ece
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2
deleted file mode 100644
index 33a5819c6cdd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3
deleted file mode 100644
index 25d9477a40ec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postfix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a09070b893831a0d0b33c9866a022ed7
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1
index 0cb7bae1f2a6..b8254752071e 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3a879a0c2bc62c59088fdeb6abbe0f2b
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2
index e1cef64e34fb..1acb6e5146c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3a879a0c2bc62c59088fdeb6abbe0f2b
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3
index 882806137e06..897bc91a41f6 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3da710cfa0d4d59f867dc70a46bd8adf
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180701-r1
new file mode 100644
index 000000000000..322f24abf901
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postfix
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3da710cfa0d4d59f867dc70a46bd8adf
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-9999 b/metadata/md5-cache/sec-policy/selinux-postfix-9999
index 86acb8c18e40..8a695a98c8c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3da710cfa0d4d59f867dc70a46bd8adf
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2
deleted file mode 100644
index 8e6cd68c1295..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3
deleted file mode 100644
index 9d9939053fef..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgresql
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0a62e7127f65b94555ff0a57db15aea0
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1
index 28705eccac19..dd5cedae1bbb 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=87317edffdb160bbf8f991733ff94d4a
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2
index dacf11732e11..c966f3d0d4d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=87317edffdb160bbf8f991733ff94d4a
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3
index 4c4ae87a7cbe..789150c952de 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48c12f43943558e5fc158710bd26f983
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180701-r1
new file mode 100644
index 000000000000..7dc0f7ec8f08
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postgresql
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=48c12f43943558e5fc158710bd26f983
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-9999 b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
index 8558ffe864d1..1a952c8e4571 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48c12f43943558e5fc158710bd26f983
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2
deleted file mode 100644
index 79f7f6581d9c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3
deleted file mode 100644
index ff982f348cc1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for postgrey
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=73e139d6f4c8e6e973b8305385a07a76
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1
index 17536ff74e71..6eebc217e575 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3565390ad4d307b6c768e6a6850ae18f
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2
index e3bea757fb08..918d2459f9ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3565390ad4d307b6c768e6a6850ae18f
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3
index 9d1dd29df4dc..58c96885164e 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d39be12b93a37f0441569a3765453ecf
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180701-r1
new file mode 100644
index 000000000000..958f2f7114d9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for postgrey
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d39be12b93a37f0441569a3765453ecf
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-9999 b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
index 56b36ba307d7..22be88802a17 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d39be12b93a37f0441569a3765453ecf
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2
deleted file mode 100644
index 031dc89725e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3
deleted file mode 100644
index f465f16972ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ppp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bb77d76d44e5a6cfaee28372d411fa11
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1
index 91762ff12f33..8933b5359a7a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7c207ad7e6a1a03b0d441f0877b3fc78
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2
index b416af339f95..a4798047083d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7c207ad7e6a1a03b0d441f0877b3fc78
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3
index 5ce11b3a99f6..a95daeaccdb4 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7d175c9d114b0e0d3b8f9681d3fad1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180701-r1
new file mode 100644
index 000000000000..65486acbc839
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ppp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=7d175c9d114b0e0d3b8f9681d3fad1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-9999 b/metadata/md5-cache/sec-policy/selinux-ppp-9999
index 7e5c9dc76d4d..30361df3b759 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7d175c9d114b0e0d3b8f9681d3fad1ea
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2
deleted file mode 100644
index f7a1c636a1da..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3
deleted file mode 100644
index d21256a9892d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelink
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a31fb9221737c1282d91dcd52609996c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1
index acd92bb0cef8..fec8bc809e47 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1f8efe344b8b1eecb042864c83bd0417
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2
index 031ce11b7ccf..c164c04e9bdc 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1f8efe344b8b1eecb042864c83bd0417
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3
index 4de2167f567a..e42763d360ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2746ebb94069f4e04eb86b359e5ae59
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180701-r1
new file mode 100644
index 000000000000..b2b81341b689
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for prelink
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c2746ebb94069f4e04eb86b359e5ae59
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-9999 b/metadata/md5-cache/sec-policy/selinux-prelink-9999
index 267382714ea8..9858795871ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2746ebb94069f4e04eb86b359e5ae59
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2
deleted file mode 100644
index d50f8b294ce7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3
deleted file mode 100644
index 4ac53fd2ddc4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for prelude
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=191e56e47a9f53366909a51b1ccfd73d
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1
index f54e6bb8747c..9947591df192 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f8fd2534f0db852992d90e21407f559c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2
index 9fc9e1236b6c..ba4de496173a 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f8fd2534f0db852992d90e21407f559c
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3
index 311e1d0c2d82..4a2949ec82d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b1938bd2f11047c6293189caaa4400eb
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180701-r1
new file mode 100644
index 000000000000..c308ca44a89a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for prelude
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b1938bd2f11047c6293189caaa4400eb
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-9999 b/metadata/md5-cache/sec-policy/selinux-prelude-9999
index bd7ec361c90f..0548c084064e 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b1938bd2f11047c6293189caaa4400eb
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2
deleted file mode 100644
index fe5d9fb1e49d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3
deleted file mode 100644
index e7b7aa63d7cb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for privoxy
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=240134a933f508577b71077a81bb3c3a
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1
index 5e20bf74616e..ab9edf45e409 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f55adc2224719f68b6cf08b55b684dc
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2
index 39b411f8236e..daf784c77ccf 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f55adc2224719f68b6cf08b55b684dc
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3
index 0cf6b3b17830..f5c8a401c0b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b67863098515cf01447eb1061f2f5d74
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180701-r1
new file mode 100644
index 000000000000..eaca16433a69
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for privoxy
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b67863098515cf01447eb1061f2f5d74
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-9999 b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
index 9ac261f86132..e0b48ec91a21 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b67863098515cf01447eb1061f2f5d74
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2
deleted file mode 100644
index bb12ae0f8698..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3
deleted file mode 100644
index 0698893ffac5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for procmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a09d5a721b3389e60fba997074c9805f
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1
index b8821eb008b5..624e5b9c6a00 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2b1de288e47df4657d06ef69a5db9385
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2
index cb63c3dcb5f3..a041ce5ac5b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2b1de288e47df4657d06ef69a5db9385
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3
index 4c70e055fd9b..c80c0269c11d 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a5c3deceea5f9853ded289be0e60f785
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180701-r1
new file mode 100644
index 000000000000..3511e284f1a8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for procmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a5c3deceea5f9853ded289be0e60f785
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-9999 b/metadata/md5-cache/sec-policy/selinux-procmail-9999
index aa15415582cd..08b1999282b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a5c3deceea5f9853ded289be0e60f785
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2
deleted file mode 100644
index 9cf3d5ae9e40..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3
deleted file mode 100644
index 18df8e032836..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for psad
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2fc248a62ae90fa83e2a9b5e2b6bb682
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1
index 23673cbd91fd..351e4c3e857f 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cd3d3e73fe92b3eb9ca78ed2f2eac50a
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2
index 0d26e103de15..d619bd116400 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cd3d3e73fe92b3eb9ca78ed2f2eac50a
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3
index 8608a0202fe0..2c682f7a1a81 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b2490f9885a1e588d2df173df31f7d1
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-psad-2.20180701-r1
new file mode 100644
index 000000000000..d754816b4a19
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for psad
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6b2490f9885a1e588d2df173df31f7d1
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-9999 b/metadata/md5-cache/sec-policy/selinux-psad-9999
index f2f080dc1407..7427597aab77 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-9999
+++ b/metadata/md5-cache/sec-policy/selinux-psad-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6b2490f9885a1e588d2df173df31f7d1
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2
deleted file mode 100644
index cb761e8994b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3
deleted file mode 100644
index 611a369d5577..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for publicfile
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0108464fa164ce4367f83ad3dbb5a47d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1
index fccb7369405b..4f7918ac694c 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7b4aa6533e9a2672240f63771ac5641e
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2
index 6e0a6732674c..34795167a0f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7b4aa6533e9a2672240f63771ac5641e
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3
index dd0ab5ca4313..41350d415163 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29b6ec5e315cd15264fff89b0f0abc2d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180701-r1
new file mode 100644
index 000000000000..4790ddac1ff3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for publicfile
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=29b6ec5e315cd15264fff89b0f0abc2d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-9999 b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
index 36b279021676..b33346445675 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-9999
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=29b6ec5e315cd15264fff89b0f0abc2d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2
deleted file mode 100644
index 74cb411571e0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3
deleted file mode 100644
index feb8766cda88..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pulseaudio
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a4792e5dd7752df401bda04e624edb1d
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1
index ad1ec2a4cdce..9a93d3de9cbe 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=20724df85c7f6cc3d57aaea68dbb834e
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2
index b644c3530770..cc32bbac1c1b 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=20724df85c7f6cc3d57aaea68dbb834e
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3
index d75320a85f37..2a30bcbef660 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1d15b5da2b1a3b5f3ae1d41811b981e8
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180701-r1
new file mode 100644
index 000000000000..fdfb317d77d2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pulseaudio
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1d15b5da2b1a3b5f3ae1d41811b981e8
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
index 6e46f11c9244..a5d4734e1a71 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1d15b5da2b1a3b5f3ae1d41811b981e8
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2
deleted file mode 100644
index 44290c6431d2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3
deleted file mode 100644
index 90e0d963b966..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for puppet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=562b9d71944c5ed4edc6f95f1038fe6f
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1
index 69f185870c26..4418ed87a7d4 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dcc24da867a3c5b8067100e634074b10
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2
index f166afd61f08..29e5e196651a 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dcc24da867a3c5b8067100e634074b10
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3
index 0c5f8aeb1ed4..b8e4fbab004c 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=73af616de69b208615f056b3e98b8977
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180701-r1
new file mode 100644
index 000000000000..94c9f8c4812a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for puppet
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=73af616de69b208615f056b3e98b8977
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-9999 b/metadata/md5-cache/sec-policy/selinux-puppet-9999
index 0b58fa6f3500..6e4a972c007d 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=73af616de69b208615f056b3e98b8977
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2
deleted file mode 100644
index 9bee2abe3b81..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3
deleted file mode 100644
index 3a33182fc8b2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyicqt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=761fa96c12c55526eba467507d236899
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1
index eeeb06889a0e..32300e98dc1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6c49fd878aa92d01ad23aec3b3dfda52
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2
index 308b7ba40bbf..06629f3eef23 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6c49fd878aa92d01ad23aec3b3dfda52
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3
index 0577ef411d43..61205470f7b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6e8534324a9f8b7c75a8f21247ad7e03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180701-r1
new file mode 100644
index 000000000000..73f1960aef1c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pyicqt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6e8534324a9f8b7c75a8f21247ad7e03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999 b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
index 4ad298be6e4f..18548bb94f42 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6e8534324a9f8b7c75a8f21247ad7e03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2
deleted file mode 100644
index 623f7db8f6ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3
deleted file mode 100644
index be1a85078ef4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for pyzor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=65ec43a6edcc89311acb941b016eef4d
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1
index 43df6dc3292c..f2b7827da2a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9d17c8d7402bd6e3230b50744b72a596
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2
index c3fd62859510..5bed15943a87 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9d17c8d7402bd6e3230b50744b72a596
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3
index 169661eea108..06f263f86aec 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5c1eacc44f675d8b75557a703c670279
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180701-r1
new file mode 100644
index 000000000000..dcb5727d81cc
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for pyzor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=5c1eacc44f675d8b75557a703c670279
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-9999 b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
index b02137bb4e88..6d2d34dd7f74 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5c1eacc44f675d8b75557a703c670279
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2
deleted file mode 100644
index e26f16f24a80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3
deleted file mode 100644
index b17e557d635f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qemu
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=029ae1cc76068e811c00ed70ddb4038d
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1
index 70e0fba5ddbb..951bd4a264c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fe39597e2cefc3b11e17f08228b0a1b5
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2
index 03a116a1da48..b0e47cfe7bb1 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fe39597e2cefc3b11e17f08228b0a1b5
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3
index b67d663fa5c8..008c9c1acb89 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0755be996584033e2dad5b792542580a
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180701-r1
new file mode 100644
index 000000000000..9c9144adf5d8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for qemu
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0755be996584033e2dad5b792542580a
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-9999 b/metadata/md5-cache/sec-policy/selinux-qemu-9999
index a9f8af9e6825..2d737a89a5f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0755be996584033e2dad5b792542580a
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2
deleted file mode 100644
index da0ac897795b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3
deleted file mode 100644
index 73336425a64e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for qmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8d70952c0a33110de5d15354136243f5
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1
index 3f0657fd3c5d..a05b833f8835 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6d3ec472217da0ba2c3a1f2e3a2ac5e7
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2
index 023c270c99d3..8e419a8bdfc1 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6d3ec472217da0ba2c3a1f2e3a2ac5e7
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3
index e67bbfb677a7..85cfb1f2acff 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=76657c68437144dd051ffcb4b5b08371
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180701-r1
new file mode 100644
index 000000000000..81256e1ef379
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for qmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=76657c68437144dd051ffcb4b5b08371
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-9999 b/metadata/md5-cache/sec-policy/selinux-qmail-9999
index ca8ef331bdb9..7185d1382b66 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=76657c68437144dd051ffcb4b5b08371
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2
deleted file mode 100644
index d1f73e165c1e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3
deleted file mode 100644
index fc5be2c2fd01..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for quota
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1c3d94e14cdfcd0df398e42730301c40
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1
index 19a908103082..4604c7b6351c 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9717966f0713836bb0ad272f00264e5f
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2
index 26ab33b6804d..411cf0aa7fdb 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9717966f0713836bb0ad272f00264e5f
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3
index 985c49c25a5c..376c9f04282b 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d812cddd2d2ea7feb3f87e76856a8e39
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-quota-2.20180701-r1
new file mode 100644
index 000000000000..3c818ac8ea0f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for quota
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d812cddd2d2ea7feb3f87e76856a8e39
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-9999 b/metadata/md5-cache/sec-policy/selinux-quota-9999
index f9b1e7f9ed68..ededec9292fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-9999
+++ b/metadata/md5-cache/sec-policy/selinux-quota-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d812cddd2d2ea7feb3f87e76856a8e39
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2
deleted file mode 100644
index dc79b57d2eeb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3
deleted file mode 100644
index dd734a6c921d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radius
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f9aff985239c3d1db6b34bd14165b948
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1
index bd943d52cadc..69d75a62bafa 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7ec35108fd174c3cd644f705eb86af6c
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2
index 793cf60fcfed..0b7d8eb1f6bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7ec35108fd174c3cd644f705eb86af6c
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3
index 8c17d68ce0a9..5e39ec4c1640 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=05ae7470f1e2e5ee552d12d03fc369c7
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-radius-2.20180701-r1
new file mode 100644
index 000000000000..7c8a2f129de6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for radius
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=05ae7470f1e2e5ee552d12d03fc369c7
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-9999 b/metadata/md5-cache/sec-policy/selinux-radius-9999
index 823be4a69c38..073802f1ecaf 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radius-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=05ae7470f1e2e5ee552d12d03fc369c7
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2
deleted file mode 100644
index fa8746b71749..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3
deleted file mode 100644
index 779da40b4bfa..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for radvd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0cc358d41d3ef5d724512b7a04ebabd0
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1
index 0eb1ae810252..2235d9e83317 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3dfd1874f5836500b114c401a9f56d5c
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2
index a4d871184cd2..260a254d2e81 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3dfd1874f5836500b114c401a9f56d5c
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3
index 0129f085069b..0b02584b07b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b205ee9f64ddd3b3452cb43e3d867b2d
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180701-r1
new file mode 100644
index 000000000000..f2b3e6116115
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for radvd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b205ee9f64ddd3b3452cb43e3d867b2d
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-9999 b/metadata/md5-cache/sec-policy/selinux-radvd-9999
index 5979123aefc2..d6f48c54ff87 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b205ee9f64ddd3b3452cb43e3d867b2d
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2
deleted file mode 100644
index 9a9f7dc741df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3
deleted file mode 100644
index e301cb6384c2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for razor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=513f3d4853c5b2259fd9bce562092086
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1
index 2f9b023ec53d..6effbc6231f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dfb374e312569e17dd63d419f28e5c1b
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2
index 9620d08c12d6..c02eab3b477a 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dfb374e312569e17dd63d419f28e5c1b
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3
index 389fb9b2960f..0cfed55f96e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dc40eb30405d30aec2f6b5cdd29b9228
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-razor-2.20180701-r1
new file mode 100644
index 000000000000..5822fe941caa
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for razor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=dc40eb30405d30aec2f6b5cdd29b9228
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-9999 b/metadata/md5-cache/sec-policy/selinux-razor-9999
index 2b8e691d9603..3332246becb4 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-razor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dc40eb30405d30aec2f6b5cdd29b9228
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
index 2fdd1f3dd10e..153387ef355b 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e3d006d62f2aa3c576f2a6e9cdd3fc94
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3
index 307cb6c452af..849e1e92fc00 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-redis-2.20180701-r1
new file mode 100644
index 000000000000..ed71c54737e2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for redis
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-9999 b/metadata/md5-cache/sec-policy/selinux-redis-9999
index 8731dd7a8418..542297ddbb62 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-redis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ad46b468b0d1e59bd4337029e8f6da89
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2
deleted file mode 100644
index 01f247f58cbf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3
deleted file mode 100644
index 5f2a9c56ae62..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for remotelogin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=3637d36dd1f2865db66d599ed02f0a8a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1
index 513217fb1791..c4b6552fae51 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=09403cdb14b543d3b5e4c8cc481c813d
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2
index 2e4153adffcd..7efaec418dfd 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=09403cdb14b543d3b5e4c8cc481c813d
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3
index 217dbae467e1..8a6f8d9a128d 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1fc35a6d58bcc6de2dcfe005cce75720
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180701-r1
new file mode 100644
index 000000000000..3075c320bf01
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for remotelogin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1fc35a6d58bcc6de2dcfe005cce75720
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999 b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
index 11b08bceeae7..75d76ba1ea84 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1fc35a6d58bcc6de2dcfe005cce75720
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2
deleted file mode 100644
index 4046dc62e6c3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3
deleted file mode 100644
index 9fee98157c26..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for resolvconf
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2da736ae1b02582dd51bd2dba986f186
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1
index ee1127d57927..0c3ea416f63f 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=91bf8eb7f5b18ae49eed0d39062dede6
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2
index 755b491c4e71..e812388b73a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=91bf8eb7f5b18ae49eed0d39062dede6
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3
index a1cf5f87ba0e..7f476d32200f 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dcd4ba631abd836d40ef4f2d01cc155d
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180701-r1
new file mode 100644
index 000000000000..6383c05190a4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for resolvconf
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=dcd4ba631abd836d40ef4f2d01cc155d
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-9999 b/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
index 7e83c198fc5b..dd1886dae105 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dcd4ba631abd836d40ef4f2d01cc155d
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2
deleted file mode 100644
index 33dc5f39dd0e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3
deleted file mode 100644
index 8ec8c14e122e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rgmanager
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=bef0ecf67f67b374501ac75327bd881b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1
index 478c7a742be4..82a124288de5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3cffa2e67e2b3f447d023d0ab271acdf
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2
index 39383a927fe8..b32f21d1b647 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3cffa2e67e2b3f447d023d0ab271acdf
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3
index b0ad16ef6f13..fa30e8a88489 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=731224149419904beff577f86713c5ea
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180701-r1
new file mode 100644
index 000000000000..085fa89789c6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rgmanager
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=731224149419904beff577f86713c5ea
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
index 8cb4c50f3dcf..f406fd5ff5ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=731224149419904beff577f86713c5ea
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2
deleted file mode 100644
index aa400230c5db..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3
deleted file mode 100644
index 1ea1a59d98b3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rngd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=be6fd3d2510233613c27922433ebe688
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1
index f9c7ef8ed96c..52b9f528306f 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8f10787c865e90dbe2caf6e6a444c9b2
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2
index b67ea0e902bf..920bf8c326ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8f10787c865e90dbe2caf6e6a444c9b2
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3
index 27a0e5b3e055..f03c5a33024d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fdc895b59b4c1267d58fcaed6d57e031
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180701-r1
new file mode 100644
index 000000000000..fab1ab4b33c7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rngd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=fdc895b59b4c1267d58fcaed6d57e031
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-9999 b/metadata/md5-cache/sec-policy/selinux-rngd-9999
index fe3ebcb5dcce..e4578619c823 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fdc895b59b4c1267d58fcaed6d57e031
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2
deleted file mode 100644
index e9ad44e386f2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3
deleted file mode 100644
index aae647ff4c1e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for roundup
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=83c7d1340be140807fe8d7062875d95d
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1
index 1d53f1f5ffba..940af9aaea9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1c274383b55f0584ab8f404361414df8
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2
index 240b10f201f1..e528a2afd062 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1c274383b55f0584ab8f404361414df8
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3
index 96831cb3468c..816c8dd34c93 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9c1aaf53e8331d858f14bccf50e76923
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180701-r1
new file mode 100644
index 000000000000..0f1a996a3b64
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for roundup
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=9c1aaf53e8331d858f14bccf50e76923
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-9999 b/metadata/md5-cache/sec-policy/selinux-roundup-9999
index b84d9f43a1d9..5e0b18690403 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9c1aaf53e8331d858f14bccf50e76923
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2
deleted file mode 100644
index 0191d5806560..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3
deleted file mode 100644
index 98f10f8e9740..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpc
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7af5cb6d3dc650e449238c1fe78bd512
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1
index cd9b0f9b2b45..8e524e5e0bfd 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fe288ea46536cd3059d764f4e522c97e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2
index 9bc79d1714de..c95d36820068 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fe288ea46536cd3059d764f4e522c97e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3
index 295a8519236c..1874bb618fd3 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=076d5eb57feaf8fc180626de06a9c5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180701-r1
new file mode 100644
index 000000000000..019c7378d44c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpc
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=076d5eb57feaf8fc180626de06a9c5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-9999 b/metadata/md5-cache/sec-policy/selinux-rpc-9999
index 387cb4c7450c..d397dd5681eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=076d5eb57feaf8fc180626de06a9c5dd
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2
deleted file mode 100644
index b90ffca5a659..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3
deleted file mode 100644
index c95baab11c58..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpcbind
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e847f6603ddff1dd93e9868e8714157b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1
index b9ff719444a8..858c54b2eedb 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=76c2505387acec71cfcac8b1cd807f73
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2
index f82cefea5c05..ee3ad3da313c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=76c2505387acec71cfcac8b1cd807f73
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3
index 8e63ac70f090..9ea384509b49 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f51469e60e69592f1cde006f8924b50e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180701-r1
new file mode 100644
index 000000000000..b3efd86efba6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpcbind
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f51469e60e69592f1cde006f8924b50e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999 b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
index 4c2bbf31a8f1..10e9b16d21b7 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f51469e60e69592f1cde006f8924b50e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2
deleted file mode 100644
index 855e776ae072..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3
deleted file mode 100644
index 7b534c488f80..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rpm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=cd2e0983ad26ba4f55c996fbdadca59b
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1
index 6f2806ff7bd6..788a5512f332 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=87e6134a683c8e4e80fa4a11e048c5c5
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2
index f39ce9932c5a..c18b1a00435d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=87e6134a683c8e4e80fa4a11e048c5c5
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3
index a7013f5c92c0..a71b3ba55f9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=646412944e29d54d5f950613a1ae5f51
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180701-r1
new file mode 100644
index 000000000000..9ea6ca9a1e52
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rpm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=646412944e29d54d5f950613a1ae5f51
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-9999 b/metadata/md5-cache/sec-policy/selinux-rpm-9999
index 459b5898d38d..8812610269d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=646412944e29d54d5f950613a1ae5f51
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2
deleted file mode 100644
index 76e0fcbf07e1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3
deleted file mode 100644
index a109e8a53ed2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rssh
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=516d904c2bd0115c013bb42f41410d01
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1
index 142835a3cd1f..d08c8669c7ac 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7f99fc64864d3267f1f239449ef2e11b
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2
index e753ef22d226..b8b904a0d7fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7f99fc64864d3267f1f239449ef2e11b
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3
index 35836e800a4a..41fc2d80fea0 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4d24b9ef9ff76fe2d7584ed192ba814c
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180701-r1
new file mode 100644
index 000000000000..af8311c0f16e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rssh
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=4d24b9ef9ff76fe2d7584ed192ba814c
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-9999 b/metadata/md5-cache/sec-policy/selinux-rssh-9999
index 72bc380a18f7..c12d606faec5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4d24b9ef9ff76fe2d7584ed192ba814c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2
deleted file mode 100644
index f9a53e11fe2b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3
deleted file mode 100644
index 8854a4be1fcc..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtkit
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9251dad1cb171051dd56c030ded0751c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1
index f5888eb0e135..74d50a8386fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=85dc4588d2038ff77277b0ce579d7190
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2
index 88f5292a1522..b6fbcdcac25a 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=85dc4588d2038ff77277b0ce579d7190
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3
index bf126058fc60..725a4b2380d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c6ff9bb14b58114041d60c8fb17808f1
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180701-r1
new file mode 100644
index 000000000000..bec5aea1b7da
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rtkit
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c6ff9bb14b58114041d60c8fb17808f1
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-9999 b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
index baa8b88935b2..4ecb167ef6cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c6ff9bb14b58114041d60c8fb17808f1
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2
deleted file mode 100644
index c91f410046d1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3
deleted file mode 100644
index 5915733e8c69..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for rtorrent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=42d604590bfa512ce9db484c2b1be79c
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1
index c98f0268d474..1eb7f3be7368 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0fe6ecb268d26d5460c39897f3ce434a
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2
index 1a4650e46c41..cca4a49d698f 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0fe6ecb268d26d5460c39897f3ce434a
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3
index 4fbc1704f901..be493328328c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a1a743c969abe00ecb27677be782147e
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180701-r1
new file mode 100644
index 000000000000..02e5423020c2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for rtorrent
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a1a743c969abe00ecb27677be782147e
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999 b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
index 993c90c3bd44..747f3c23bd6c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a1a743c969abe00ecb27677be782147e
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2
deleted file mode 100644
index c3f23f72ee82..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3
deleted file mode 100644
index 2a64253727a2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for salt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9c9c76b04cb69a0d0db9948f2ef77a74
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1
index f25d9b46c234..16a712a70b3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=60c40e51e23acd4df3709d318673d6b8
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2
index 9a339a6c91df..042ad06fe06a 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=60c40e51e23acd4df3709d318673d6b8
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3
index 9f0f85249ac1..defe68d697c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=64aca4a988a80ebfe988749d9512ffa9
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-salt-2.20180701-r1
new file mode 100644
index 000000000000..54ce5b1f42ac
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for salt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=64aca4a988a80ebfe988749d9512ffa9
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-9999 b/metadata/md5-cache/sec-policy/selinux-salt-9999
index 57d99ff4a098..0799a4fb4eae 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-salt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=64aca4a988a80ebfe988749d9512ffa9
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2
deleted file mode 100644
index 271579abe291..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3
deleted file mode 100644
index 6f4b2faaefd8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for samba
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=8e0815ba9782af9533bf1ff6bae770c5
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1
index 5d1737ea1218..d7ba3f9b99c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9898b5d8fa513744d0427fd1372b4646
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2
index b5fff6c0ba50..5a3ca4ca2332 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9898b5d8fa513744d0427fd1372b4646
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3
index ee5f14d72c33..efbcc44eb55f 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6713342dd181257405ca7af8e014a94b
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-samba-2.20180701-r1
new file mode 100644
index 000000000000..290e1e54b8e2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for samba
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6713342dd181257405ca7af8e014a94b
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-9999 b/metadata/md5-cache/sec-policy/selinux-samba-9999
index 1d90f02421d2..407660d48bbf 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-9999
+++ b/metadata/md5-cache/sec-policy/selinux-samba-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6713342dd181257405ca7af8e014a94b
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2
deleted file mode 100644
index bb5813a5e520..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3
deleted file mode 100644
index 94a466231839..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sasl
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=0830f456cdef9e887b466e402757c385
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1
index 89c8a6572002..df578e2f448d 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=66979307f1e91c6b64e8c133a41cc262
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2
index d1b8a01a0f0a..120cbefb1855 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=66979307f1e91c6b64e8c133a41cc262
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3
index 23b1f390f3c2..e12735c76cfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ce9b231ae8160c8a469139f792561b12
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180701-r1
new file mode 100644
index 000000000000..7eb3c362dc14
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sasl
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ce9b231ae8160c8a469139f792561b12
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-9999 b/metadata/md5-cache/sec-policy/selinux-sasl-9999
index d5c35455f9d9..30d5dd5bccc9 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ce9b231ae8160c8a469139f792561b12
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2
deleted file mode 100644
index 5e5779b2c17b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3
deleted file mode 100644
index 9dec50f63a63..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for screen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d4e2b32622f203938ebc17d10a0de98e
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1
index 3f1dd36f407a..01880efc2a5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7b50bc175c58b7038ac22cb1f63f1e54
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2
index e789024c8216..f77c66a04ddc 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7b50bc175c58b7038ac22cb1f63f1e54
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3
index 014097fe9eda..fd6bc74fd42e 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=58f5e5955a1f4f38f988fd2e2c41da22
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-screen-2.20180701-r1
new file mode 100644
index 000000000000..aec4abad61e7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for screen
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=58f5e5955a1f4f38f988fd2e2c41da22
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-9999 b/metadata/md5-cache/sec-policy/selinux-screen-9999
index 3d2c03757e5a..00a440d798d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-screen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=58f5e5955a1f4f38f988fd2e2c41da22
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2
deleted file mode 100644
index 30d8c1b3a90a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3
deleted file mode 100644
index 03c8325af439..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sendmail
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=ee1134920ee3452f757b1bce59088f5d
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1
index a6b687f6ba26..ea920960e6ff 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=383c253b227f9c5ce8b508cb9920e8f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2
index bd17153acbcf..0caaff35cb3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=383c253b227f9c5ce8b508cb9920e8f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3
index 3cd19efd5d66..8e79ccf2a323 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=33bc136f1abf60a62ffb996cc72c1d91
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180701-r1
new file mode 100644
index 000000000000..fb96a24de263
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sendmail
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=33bc136f1abf60a62ffb996cc72c1d91
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-9999 b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
index 9e72c3cad0af..3fca40c53f8f 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=33bc136f1abf60a62ffb996cc72c1d91
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2
deleted file mode 100644
index 966093c8f949..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3
deleted file mode 100644
index 95a9c1eff25c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sensord
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7c88550ae1259c528e8227abef7fcdcc
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1
index e57097809001..b7058f872614 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d18042d0aeecda6513fead29c7a3c9c5
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2
index ac461c8c6801..688da1f79297 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d18042d0aeecda6513fead29c7a3c9c5
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3
index 7ec9f8a85389..44eef9dc05ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dc4f7b9575f6c2e7bffefe1536b79f22
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180701-r1
new file mode 100644
index 000000000000..6529df3fbff6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sensord
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=dc4f7b9575f6c2e7bffefe1536b79f22
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-9999 b/metadata/md5-cache/sec-policy/selinux-sensord-9999
index 317a52044ce4..2422b97221f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=dc4f7b9575f6c2e7bffefe1536b79f22
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2
deleted file mode 100644
index 60fdbb7e0873..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3
deleted file mode 100644
index 1c62468bc212..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shorewall
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4302eecb2e56387d071885ec09fa21f9
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1
index 393d0f715eae..f3c98ed9894f 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e3621196877235cf52c3d53a77e34132
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2
index a99c016941a3..5f52b9de3903 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e3621196877235cf52c3d53a77e34132
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3
index 9a1019a91bc0..46091cc64e1d 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5179a6ea11058d2bb82cb3a2311caf56
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180701-r1
new file mode 100644
index 000000000000..1494d26139a0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for shorewall
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=5179a6ea11058d2bb82cb3a2311caf56
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-9999 b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
index 6e607be81c6f..7991aa2f15ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5179a6ea11058d2bb82cb3a2311caf56
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2
deleted file mode 100644
index 5308e6436386..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3
deleted file mode 100644
index 4a821a0aa483..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for shutdown
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=881a28963443bec4268ed559b291c4f3
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1
index 479715cc1f2f..b345a8726f96 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=060ffdb8b972332283082cf9dee7c7a8
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2
index ba98a89e3f6e..6c55ffda6b48 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=060ffdb8b972332283082cf9dee7c7a8
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3
index bad7ef62dbde..7689ff06302d 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=32cb7bd5f6e8459373e54679f44c2ce5
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180701-r1
new file mode 100644
index 000000000000..8e27181111e9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for shutdown
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=32cb7bd5f6e8459373e54679f44c2ce5
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-9999 b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
index 2d3545fe9105..97cdd20bb37f 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=32cb7bd5f6e8459373e54679f44c2ce5
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2
deleted file mode 100644
index a9be0a2382e7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3
deleted file mode 100644
index 3cd11eee0835..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20170805-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for skype
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-IUSE=alsa
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a216e36cd5d2df8961dcb3923a18e732
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1
index 3d8ac1b2a54f..c78ccb99cecf 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aad8135769888af34d570c44c0b3ff0d
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2
index 0ec2275c24da..995b06246c10 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r2
@@ -8,6 +8,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=aad8135769888af34d570c44c0b3ff0d
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3
index 6b46d28ae792..2ab1ac0bffbf 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180114-r3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cd8460ca52793fa58618ccf2f8737612
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-skype-2.20180701-r1
new file mode 100644
index 000000000000..92fde8224761
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20180701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for skype
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+IUSE=alsa
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=cd8460ca52793fa58618ccf2f8737612
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-9999 b/metadata/md5-cache/sec-policy/selinux-skype-9999
index 22b099396f2e..d4944beb4627 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-9999
+++ b/metadata/md5-cache/sec-policy/selinux-skype-9999
@@ -7,5 +7,5 @@ IUSE=alsa
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cd8460ca52793fa58618ccf2f8737612
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2
deleted file mode 100644
index eeb11b00ecb3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3
deleted file mode 100644
index 4278068db1ee..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slocate
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=87ccade69f59ebac6f539f52a6543efe
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1
index 26ce70e04598..ac783768da67 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f3a1282da161ee487743be07beab547
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2
index d08214319b03..ea115c485c86 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9f3a1282da161ee487743be07beab547
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3
index 4436ba925e78..c41ea38df8be 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8e46fcc7a50547c303273596f9a8f560
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180701-r1
new file mode 100644
index 000000000000..60cd1123ace7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for slocate
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8e46fcc7a50547c303273596f9a8f560
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-9999 b/metadata/md5-cache/sec-policy/selinux-slocate-9999
index a627f30392f3..f2561e1efedd 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8e46fcc7a50547c303273596f9a8f560
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2
deleted file mode 100644
index f640e137fac7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3
deleted file mode 100644
index 73e41d423b8b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for slrnpull
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9cc2400b0b5902a127d570ce3417b768
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1
index 6c5af2ccb832..07c8bfca1771 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c73b4c486c209f42b3af8d8ae7664da2
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2
index d921367005c6..998e84477459 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c73b4c486c209f42b3af8d8ae7664da2
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3
index 6a37028c0ac1..527b381fcf0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=20a301e086a2daaf265e024d8dfbb22e
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180701-r1
new file mode 100644
index 000000000000..e041372ecbaa
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for slrnpull
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=20a301e086a2daaf265e024d8dfbb22e
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999 b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
index 3f5877af890a..411d5bc8eaea 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=20a301e086a2daaf265e024d8dfbb22e
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2
deleted file mode 100644
index 690bc7a2492b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3
deleted file mode 100644
index c1e8dbab8d01..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smartmon
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f04d989dc1e250b3d5285219630fcf76
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1
index e5aa15a07737..9c4017f2c4e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=47a3106a44266f954adc5594c84f8ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2
index b2b4f61200bc..2fa11e35c093 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=47a3106a44266f954adc5594c84f8ddc
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3
index 68edeaeb436d..26a315d3dcc5 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25bccb090018c96da80c272ff68afc08
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180701-r1
new file mode 100644
index 000000000000..d078b981b278
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for smartmon
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=25bccb090018c96da80c272ff68afc08
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-9999 b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
index aef6a6514913..eb1cf23bae39 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25bccb090018c96da80c272ff68afc08
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2
deleted file mode 100644
index ec6f8e273c2f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3
deleted file mode 100644
index 923ded5ab835..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for smokeping
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=58b991441122636d1483375af6441cc8
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1
index d18462765c71..c0e93540fda2 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8a35e10e6e7b52ded673145c9a3a355a
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2
index 775e80be1937..776dfd310d03 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8a35e10e6e7b52ded673145c9a3a355a
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3
index f8d35de66c38..6dded3d35523 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8a551a15dbc3d346fae62ca0cc8d89a3
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180701-r1
new file mode 100644
index 000000000000..f8069bf335b9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for smokeping
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8a551a15dbc3d346fae62ca0cc8d89a3
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-9999 b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
index c409886f19b3..b246ec84632f 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8a551a15dbc3d346fae62ca0cc8d89a3
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2
deleted file mode 100644
index 17980992a3b5..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3
deleted file mode 100644
index 69e97eb687ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snmp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=99ebcf7f4e906050deb03592cca792d0
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1
index 924ebe9f50fc..fc68e38594e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=51d59da6b3cef8d65acafce89643d729
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2
index 1742d5aa419b..25cafaa3d96e 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=51d59da6b3cef8d65acafce89643d729
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3
index 5e4c00f7d441..721f94087821 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2e94ad0c17c333334fa04e5069d1d084
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180701-r1
new file mode 100644
index 000000000000..9b71a1ca131a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for snmp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2e94ad0c17c333334fa04e5069d1d084
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-9999 b/metadata/md5-cache/sec-policy/selinux-snmp-9999
index ef3d2ce5bd55..d69df9ecf238 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2e94ad0c17c333334fa04e5069d1d084
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2
deleted file mode 100644
index e9e1e6a4bef2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3
deleted file mode 100644
index be43097e39d0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for snort
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=944984c7f80c22bb0f3be55342583148
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1
index 1e191df52c5c..a99bfc4aa4b4 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7ac3bf7df27f1adfeeee4078bbbfc33b
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2
index 507857da389c..33c327a71858 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7ac3bf7df27f1adfeeee4078bbbfc33b
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3
index 5fb4e3eabd8e..6c54f6c85a3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ed455a8df68c7b06b87d64aa74163938
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-snort-2.20180701-r1
new file mode 100644
index 000000000000..63ff997f982c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for snort
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ed455a8df68c7b06b87d64aa74163938
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-9999 b/metadata/md5-cache/sec-policy/selinux-snort-9999
index 7b85435b6624..90457442a34a 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snort-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ed455a8df68c7b06b87d64aa74163938
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2
deleted file mode 100644
index eb51acdebacb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3
deleted file mode 100644
index e15be71d8bad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for soundserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b7c2e24fe7e43aad63471f6c20bd42c1
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1
index 2fb29a66612a..41690a3dbe70 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=20cabb32606530bed7e7f96eff0d1492
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2
index 14e8759328e9..7bcd2c74410d 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=20cabb32606530bed7e7f96eff0d1492
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3
index 1aed8cd5d970..aa5032d3acc8 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=902baff11a6dd6500a08e1a9c02f3a5f
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180701-r1
new file mode 100644
index 000000000000..b4b08fc5756f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for soundserver
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=902baff11a6dd6500a08e1a9c02f3a5f
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-9999 b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
index 057a794f1dd4..cf549b8c1800 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=902baff11a6dd6500a08e1a9c02f3a5f
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2
deleted file mode 100644
index ac3567de4db2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3
deleted file mode 100644
index ac8beba0482e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for spamassassin
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=445ad377da6952e04740b39a085371fd
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1
index 2fb9d81df73e..33e1ab4e873b 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3b3d1207f6ade0896145e76bc4bba3f6
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2
index 4d3fe7f11df7..a6565bc5ab68 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3b3d1207f6ade0896145e76bc4bba3f6
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3
index 747bf4a51d89..ae4c234bb9e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e02095dc4ff4d5dd3826b57f90b05d11
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180701-r1
new file mode 100644
index 000000000000..ec87d334df9a
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for spamassassin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e02095dc4ff4d5dd3826b57f90b05d11
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999 b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
index 39e6437d2bcc..88ca9f42ba1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e02095dc4ff4d5dd3826b57f90b05d11
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2
deleted file mode 100644
index 9786765c3f2f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3
deleted file mode 100644
index cadf4b8b5223..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for speedtouch
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7461b9e0a3cf24b2ce0ea42c6fc5e0f7
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1
index 09ce3b8eda6c..f43a835f9ceb 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b38c2eed40c892fc8ae9dc89865c871e
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2
index 8c2067de71e6..f7bd69adf2a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b38c2eed40c892fc8ae9dc89865c871e
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3
index 2c6887565881..52f2623ce817 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cde969522459b9639437d6da9fb352db
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180701-r1
new file mode 100644
index 000000000000..5eff486731cb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for speedtouch
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=cde969522459b9639437d6da9fb352db
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999 b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
index 078bed317407..74f62207da70 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cde969522459b9639437d6da9fb352db
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2
deleted file mode 100644
index c27fbdbfc559..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3
deleted file mode 100644
index b2a9e680104a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for squid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=240154e90a0a93a45c72b4fcd1af7536
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1
index 89f807826f11..fb32a8d2dba1 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0590c23cb4c3823ce2092029aac3fbeb
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2
index 3b63d612c76a..c18eada87e0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0590c23cb4c3823ce2092029aac3fbeb
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3
index aa55076cf4a4..281c1dbe45a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2cd27caa1e4a9471fceb304894d5d69
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-squid-2.20180701-r1
new file mode 100644
index 000000000000..599a47270c9c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for squid
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c2cd27caa1e4a9471fceb304894d5d69
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-9999 b/metadata/md5-cache/sec-policy/selinux-squid-9999
index 8f6c4d17b069..faa3af928941 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-squid-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2cd27caa1e4a9471fceb304894d5d69
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2
deleted file mode 100644
index 2098bac83b84..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3
deleted file mode 100644
index 4c7f6ea27183..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sssd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=f70d335c134b388f0c6ae9a40a24a1ad
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1
index e0b9807654da..ecf31fb7aada 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e3e0908b01b9744f24706c14d1d8099f
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2
index 6d7596ad9c12..24fa2b190499 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e3e0908b01b9744f24706c14d1d8099f
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3
index 246b5bf4c3af..ff714d4dfaea 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5935965151b1cf877b3ac2b924e99b72
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180701-r1
new file mode 100644
index 000000000000..83d75372ea2e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sssd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=5935965151b1cf877b3ac2b924e99b72
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-9999 b/metadata/md5-cache/sec-policy/selinux-sssd-9999
index b5847f42a1cf..92cc8c24827d 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5935965151b1cf877b3ac2b924e99b72
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2
deleted file mode 100644
index bec3d20d32b3..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3
deleted file mode 100644
index ab3bfee4c00b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for stunnel
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=563bcba7c74ccc2b27024eb1e61b1c3c
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1
index 25c81a394c63..647926dbb085 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a5c031c66c1b14689f2b45ba32c8fb1b
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2
index f1c7fdd1c14b..17090ed82588 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a5c031c66c1b14689f2b45ba32c8fb1b
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3
index c0d32a4b94c3..65c96145ccea 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c5b05354c7be95fa5568bff0366beddd
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180701-r1
new file mode 100644
index 000000000000..8804f79f248b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for stunnel
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c5b05354c7be95fa5568bff0366beddd
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-9999 b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
index cba06c68407f..52aac889f584 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-9999
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c5b05354c7be95fa5568bff0366beddd
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2
deleted file mode 100644
index 77160ed1be5e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3
deleted file mode 100644
index 996d0b336530..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for subsonic
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=9c72eced34821c2a445ad00410726f15
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1
index 45e7b1297cc9..cfaa04ab24d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f78706ef1c72abaa2b91a117e43eb3af
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2
index 5b91fd4d38de..5330317a5fa6 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f78706ef1c72abaa2b91a117e43eb3af
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3
index 4b0d1eac8037..466b619b026c 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2c9f3411e18ebe4203ad7d66e7188f89
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180701-r1
new file mode 100644
index 000000000000..6082321252f2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for subsonic
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2c9f3411e18ebe4203ad7d66e7188f89
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-9999 b/metadata/md5-cache/sec-policy/selinux-subsonic-9999
index c2e34599b298..4c8d92d7bff7 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-9999
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2c9f3411e18ebe4203ad7d66e7188f89
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2
deleted file mode 100644
index f0f5abf8a17d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3
deleted file mode 100644
index c7482df5e789..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sudo
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b20f6a398f2e032144ba410fec1eb7f6
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1
index 83c741801617..67a13441ca87 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=18bb1566bdf6283862bb40c40974639c
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2
index fd3868cf5c7f..8a4a493d3854 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=18bb1566bdf6283862bb40c40974639c
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3
index 51005fba2369..2d9f9dabf6da 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=beb4da03b2f538dd0ec6e92d4d1197e9
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180701-r1
new file mode 100644
index 000000000000..7cc8997aae86
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sudo
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=beb4da03b2f538dd0ec6e92d4d1197e9
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-9999 b/metadata/md5-cache/sec-policy/selinux-sudo-9999
index 203b98c6e7de..ae20b6a36e0b 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=beb4da03b2f538dd0ec6e92d4d1197e9
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2
deleted file mode 100644
index e8f06db767d7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3
deleted file mode 100644
index 381b393ef00d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sxid
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=210cfcd5798d4a21af8c2827c3438b10
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1
index 7fbb8f1c7e56..f14e6f6f211f 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2aafb61b7ab53c405155fecd275cdd0c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2
index d880556fe040..5318424b158e 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2aafb61b7ab53c405155fecd275cdd0c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3
index d284d4ebd1b3..95e83d6f1a86 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4e7efacbeb22fb75f55e26b99059877c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180701-r1
new file mode 100644
index 000000000000..4a307504248f
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sxid
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=4e7efacbeb22fb75f55e26b99059877c
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-9999 b/metadata/md5-cache/sec-policy/selinux-sxid-9999
index 756fc05ace86..ab732aae5750 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=4e7efacbeb22fb75f55e26b99059877c
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2
deleted file mode 100644
index 9bde2997bd82..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3
deleted file mode 100644
index b8ab9e977657..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for syncthing
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=6457fb0b0120094fc3188b161eabc82b
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1
index b76f5cc36cf9..4f25939f7447 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bedba4baa12a60c8e9ee3ae628593a45
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2
index 8b39de4db8bd..e87ac9628d49 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bedba4baa12a60c8e9ee3ae628593a45
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3
index c17d27dbc367..40ff502a5466 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=05dc0dd1b4e6466759ffae74a6f9b957
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180701-r1
new file mode 100644
index 000000000000..ba8003751872
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for syncthing
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=05dc0dd1b4e6466759ffae74a6f9b957
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-9999 b/metadata/md5-cache/sec-policy/selinux-syncthing-9999
index bc5083cc63ad..1a0266addd51 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-9999
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=05dc0dd1b4e6466759ffae74a6f9b957
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2
deleted file mode 100644
index 30ef5298a2b6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3
deleted file mode 100644
index 9488990c960f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for sysstat
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=02b251426fb84968f2dd5e71d4a58ba4
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1
index e2b8b285e09a..6afadce3eb0a 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3205a54af6cb642b29b05b1f5a694fcb
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2
index 601637e0f7d6..b2c8838a86de 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3205a54af6cb642b29b05b1f5a694fcb
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3
index 094eb4dde41c..620a075ad248 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8f0f8634a158581163550c4978f51265
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180701-r1
new file mode 100644
index 000000000000..493079b45f9c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for sysstat
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8f0f8634a158581163550c4978f51265
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-9999 b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
index 348594c9f374..e11d09589ed8 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8f0f8634a158581163550c4978f51265
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2
deleted file mode 100644
index e84d68f86220..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3
deleted file mode 100644
index 1af66fe9d24c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tboot
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=7ed5397bbbedacc83ac28d052207799c
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1
index 87104552eec3..6e9ea49525eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8ad75ae42a5232b72aaedd0c849260a3
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2
index 272b43725faf..9592e129c552 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8ad75ae42a5232b72aaedd0c849260a3
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3
index deb69a994ada..845af49ccec6 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2f98e85a1e1b995a79e49411f81f22b
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180701-r1
new file mode 100644
index 000000000000..70ec8a8a7a5e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tboot
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c2f98e85a1e1b995a79e49411f81f22b
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-9999 b/metadata/md5-cache/sec-policy/selinux-tboot-9999
index 7d2d359d85e6..ee7cd0a2925c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c2f98e85a1e1b995a79e49411f81f22b
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2
deleted file mode 100644
index bf8fb4ce32f2..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3
deleted file mode 100644
index 4e0a1f88bded..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcpd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=66f63b8343c30fdf6d848710cb5c5ec8
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1
index 8a0fdcb6481a..ea0e7c6c063e 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=10435c54e4cd1198d1b058498e0b213d
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2
index 2150f8c8543c..dae813374be3 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=10435c54e4cd1198d1b058498e0b213d
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3
index 6595fb086ccb..6c229dbe7a9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2087cde4172974fa87b347f6803c1f7e
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180701-r1
new file mode 100644
index 000000000000..539719538cc3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tcpd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2087cde4172974fa87b347f6803c1f7e
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-9999 b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
index 9a8bdcffabda..6826401875d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2087cde4172974fa87b347f6803c1f7e
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2
deleted file mode 100644
index 48cd2dcf7e93..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3
deleted file mode 100644
index f747ed6ae6e8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tcsd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=db518a2816de59e4254144c41ca5efe1
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1
index d4519042c873..1fde6ca9c145 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=04b269b8d30d8b31105717c0e4e496ee
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2
index 2e31e35b0527..d712f79c875a 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=04b269b8d30d8b31105717c0e4e496ee
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3
index 6b875a0bf487..ffeacb2bf680 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=52116ede59c4a8ce2f56086a22cdb3e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180701-r1
new file mode 100644
index 000000000000..fa0b489ea9b3
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tcsd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=52116ede59c4a8ce2f56086a22cdb3e9
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-9999 b/metadata/md5-cache/sec-policy/selinux-tcsd-9999
index 30f8883a95a2..12de5e79a730 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=52116ede59c4a8ce2f56086a22cdb3e9
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2
deleted file mode 100644
index b21b6da9fb30..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3
deleted file mode 100644
index 73e9b3be76ab..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for telnet
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e5cf5ef22afadba7fff618898a57e68f
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1
index acb49cf32633..ba452dcc7887 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bb0658ff7657a8e92ee3125edf7642eb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2
index e5aa0ae69b62..3cfcf8c7de14 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bb0658ff7657a8e92ee3125edf7642eb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3
index fa0ae726fe29..999bada38065 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ec02cf15526d3ad7ceb948a7b01abfb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180701-r1
new file mode 100644
index 000000000000..c2261ece9e51
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for telnet
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=2ec02cf15526d3ad7ceb948a7b01abfb
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-9999 b/metadata/md5-cache/sec-policy/selinux-telnet-9999
index 01f023e1aceb..69f689069d48 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2ec02cf15526d3ad7ceb948a7b01abfb
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2
deleted file mode 100644
index 89783c2383df..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3
deleted file mode 100644
index 49ec61af3b29..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tftp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e03ab91ad8bbc7b389a5804f093bd7a4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1
index 86e8bff05583..7391f2a2e395 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1ae17d445e874adc210a72f82080bed4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2
index 5d83db14be99..7a42dab9f624 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1ae17d445e874adc210a72f82080bed4
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3
index 4aad90ed0761..2d9ab4d14a89 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=36968fefd7636d95db21fef3f31a2fa1
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180701-r1
new file mode 100644
index 000000000000..1576feb056a2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tftp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=36968fefd7636d95db21fef3f31a2fa1
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-9999 b/metadata/md5-cache/sec-policy/selinux-tftp-9999
index 63e857915d2d..eb0bd7baabaf 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=36968fefd7636d95db21fef3f31a2fa1
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2
deleted file mode 100644
index 2f663b3a89e0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3
deleted file mode 100644
index 2644ad68ab43..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tgtd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=963964622483f98eb753ed3305bbcb96
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1
index 2805d16be7e6..5c37304d5402 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bfb1bc97f0fd872e3ae809d5a11005f6
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2
index 2780f8d94d21..f05b35046812 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bfb1bc97f0fd872e3ae809d5a11005f6
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3
index dc39a7ef7992..278170df426f 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6261fc6849868d691f74a74625aeae00
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180701-r1
new file mode 100644
index 000000000000..3e273c3f870e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tgtd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=6261fc6849868d691f74a74625aeae00
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-9999 b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
index bc9e361f264d..6b19f2b35d55 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=6261fc6849868d691f74a74625aeae00
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2
deleted file mode 100644
index c26c81f99b77..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3
deleted file mode 100644
index b17b16b10345..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for thunderbird
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4b0d5e21bb2a069fcc1c8aeaa2a9492e
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1
index 0560c99071aa..fa9c4628cd30 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=357d98672948b971e2f2ec27cfb493e3
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2
index f39c8cb96a0d..40c67ebb5e20 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=357d98672948b971e2f2ec27cfb493e3
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3
index e9737b41dacb..8377e21f9be7 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8be24b813a34de4bbf8953a267306d3f
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180701-r1
new file mode 100644
index 000000000000..5da43c7d53ae
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for thunderbird
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=8be24b813a34de4bbf8953a267306d3f
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999 b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
index 006ec62be285..81332d117230 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8be24b813a34de4bbf8953a267306d3f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2
deleted file mode 100644
index b52c6f7366f4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3
deleted file mode 100644
index 76e02d740778..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for timidity
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c49564453769c96edf12270ba74daa6f
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1
index ea227fd5bae3..01ab8649295f 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a133d2823e517dcb26e6b8a2c9ec8dbe
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2
index 087e916c031e..11f48942fc9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a133d2823e517dcb26e6b8a2c9ec8dbe
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3
index 0e3553e3cc89..048c955fbf91 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=14d6017b234b823f9aef4293fc1c24e4
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180701-r1
new file mode 100644
index 000000000000..985308711076
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for timidity
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=14d6017b234b823f9aef4293fc1c24e4
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-9999 b/metadata/md5-cache/sec-policy/selinux-timidity-9999
index 2d55ae664dbf..c9bb073d0137 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-9999
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=14d6017b234b823f9aef4293fc1c24e4
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2
deleted file mode 100644
index 713e8a9b24ec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3
deleted file mode 100644
index 7b3112b7cc1e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tmpreaper
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e3229da878ec8cfd613de3ccc5a57e70
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1
index 1ce3b7941f40..8f638825c435 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5b8c31a24289068c1822903bf63e79e2
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2
index 4cf287f8440a..8b9721127971 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5b8c31a24289068c1822903bf63e79e2
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3
index 1e1abeb38f4b..9a3be01994b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e42c742c78a43b8a4c3f4a0298ca06ce
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180701-r1
new file mode 100644
index 000000000000..a3b1071349cd
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tmpreaper
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=e42c742c78a43b8a4c3f4a0298ca06ce
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
index 65f62c14a0a2..fbe08503436e 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e42c742c78a43b8a4c3f4a0298ca06ce
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2
deleted file mode 100644
index 5c6fc47ce1e9..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3
deleted file mode 100644
index 3bee47935896..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tor
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=af3a7a4e370278711c9f13de679d80dc
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1
index 26b0f3ff6853..19f853026b47 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=68e050c308ef42de5f086b23fee4b428
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2
index 216fd5802992..c39d48b72034 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=68e050c308ef42de5f086b23fee4b428
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3
index 6cecc7b04570..98eaef3292d7 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4b6ac45072bbcfbd8963ee243df78f1
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tor-2.20180701-r1
new file mode 100644
index 000000000000..49b50ddf3d5c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tor
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b4b6ac45072bbcfbd8963ee243df78f1
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-9999 b/metadata/md5-cache/sec-policy/selinux-tor-9999
index 5a5b438bf4a4..38c9404d82ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4b6ac45072bbcfbd8963ee243df78f1
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2
deleted file mode 100644
index fc5794d7586d..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3
deleted file mode 100644
index d970779b647c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for tripwire
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2dfedb66de6b577f1534ec1f66a58ff3
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1
index 1a8e73304332..c6836721004c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=018fbe3d8d2607d26775feacc5d5d9b1
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2
index ae1d01981530..d4e20c851bce 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=018fbe3d8d2607d26775feacc5d5d9b1
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3
index 924d73aaed40..29b7f2d65ddc 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7fa0607e948b381c25cd0133f31fb053
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180701-r1
new file mode 100644
index 000000000000..ae0afea8ebe6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for tripwire
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=7fa0607e948b381c25cd0133f31fb053
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-9999 b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
index a645a2919268..add779b4fa49 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7fa0607e948b381c25cd0133f31fb053
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2
deleted file mode 100644
index 0336c7d6c039..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3
deleted file mode 100644
index 3dc4d580e35b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ucspitcp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=6777ad927727b9726bacddd38bcb85d6
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1
index 0ee2ec34027e..93f87c9a9b5f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=99f83b452ca6e1b206df89f2042d10e7
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2
index 697d7041edec..d1a47d6172fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=99f83b452ca6e1b206df89f2042d10e7
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3
index 0bac6a1d43ee..fcf0b8a321f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3d98b16ebbda94b80367f18637b6095f
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180701-r1
new file mode 100644
index 000000000000..2a1075a4b0c0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ucspitcp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3d98b16ebbda94b80367f18637b6095f
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
index 412a53a19d8d..eda4e19ef128 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3d98b16ebbda94b80367f18637b6095f
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2
deleted file mode 100644
index de18387ff192..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3
deleted file mode 100644
index 4ae7bffcd307..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for ulogd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=1b19285eb02dffdf6ad57a9236b0f953
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1
index 510621c35f8c..b5eb13b7c982 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=60d43ed612fe9148797b12afc5e1eb97
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2
index e24d696f61c0..78815d7fb322 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=60d43ed612fe9148797b12afc5e1eb97
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3
index 72a806ac343a..279e2ed3f762 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3374a3ab5963540511a285b2ed1bc7e6
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180701-r1
new file mode 100644
index 000000000000..0fe05a3530c7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for ulogd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3374a3ab5963540511a285b2ed1bc7e6
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-9999 b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
index 678e230ef893..68bab2f7d86b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3374a3ab5963540511a285b2ed1bc7e6
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2
deleted file mode 100644
index ba19b536be65..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3
deleted file mode 100644
index 74ef46f07638..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uml
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=78fa17ad1c34669d3197052202a640ca
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1
index 4ea98e705797..51f0cc15910e 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8e88deeb20f728a12d627a2043fc4616
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2
index f8c3e2304bb8..958aa573d62d 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8e88deeb20f728a12d627a2043fc4616
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3
index 78cf81820cc4..3bb5f10d5092 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a08d83d838bf3032c07e9cc3c924eb1c
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-uml-2.20180701-r1
new file mode 100644
index 000000000000..0763eec7788d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uml
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a08d83d838bf3032c07e9cc3c924eb1c
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-9999 b/metadata/md5-cache/sec-policy/selinux-uml-9999
index e752a4215f55..4519ffab63c5 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a08d83d838bf3032c07e9cc3c924eb1c
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2
deleted file mode 100644
index a2ca839f55be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3
deleted file mode 100644
index 1c9ddf24fab0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for unconfined
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=992f8e4e22fa14ba11e787ef857176e9
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1
index 975c67c0f8e2..399eac5eb9e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f8eb09f61cf6bc06f0b83fa89d089480
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2
index f48b2a589a88..b8095266b572 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f8eb09f61cf6bc06f0b83fa89d089480
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3
index 1e87cf229d6e..d6144512e3b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d16eac578d8fa4a8aef39ad926d8d18a
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180701-r1
new file mode 100644
index 000000000000..140c35e9ebab
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for unconfined
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d16eac578d8fa4a8aef39ad926d8d18a
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-9999 b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
index 643b8018f689..54d3d96b88e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-9999
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d16eac578d8fa4a8aef39ad926d8d18a
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2
deleted file mode 100644
index 0076ba83cc36..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3
deleted file mode 100644
index e76890627aad..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uptime
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=30026f5ae64f96e4af896bcb8cc23973
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1
index f4822c29ba14..537ec35cf184 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e8470ad91c80390d6ac1da86a186b49
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2
index 8beb0627ff16..364afcad52ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9e8470ad91c80390d6ac1da86a186b49
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3
index f82a0de88d5c..a9685abf88a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a2fd007f14764d281189fb6eecd8e9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180701-r1
new file mode 100644
index 000000000000..61624773363c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uptime
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=a2fd007f14764d281189fb6eecd8e9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-9999 b/metadata/md5-cache/sec-policy/selinux-uptime-9999
index 2b60970b8678..29fa6547b509 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a2fd007f14764d281189fb6eecd8e9f0
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2
deleted file mode 100644
index ccd93b27e3cb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3
deleted file mode 100644
index e10b3620fd9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for usbmuxd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=33996a6f754d3e6f9154aa1b685cb2ac
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1
index 0ac22cf394a0..581277f2b032 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a49bac21a65b4b19d8e35ac85ae9ce06
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2
index 723da092a5bd..39788273b74b 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a49bac21a65b4b19d8e35ac85ae9ce06
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3
index 2d2d76fa4624..5f9d76693e41 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=195b1d757507ef7aa6dacb494fcc3533
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180701-r1
new file mode 100644
index 000000000000..262e934550b1
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for usbmuxd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=195b1d757507ef7aa6dacb494fcc3533
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
index b0d264072ac2..f79ef920a5ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=195b1d757507ef7aa6dacb494fcc3533
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2
deleted file mode 100644
index 4b76930e5af8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3
deleted file mode 100644
index b556c905e27e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uucp
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=723669456e171dd75ba53e31f8810924
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1
index 94553858ab3a..3c3eb9e55889 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a5ea22be37a69fcecdcb67f75579a5eb
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2
index 4982c27242f5..3e7d7b22f57e 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=a5ea22be37a69fcecdcb67f75579a5eb
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3
index 1ad658983a3a..b8c0619c1fba 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1cae4a8786c5515b523907d01f41f126
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180701-r1
new file mode 100644
index 000000000000..ff6d9731b6d4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uucp
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1cae4a8786c5515b523907d01f41f126
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-9999 b/metadata/md5-cache/sec-policy/selinux-uucp-9999
index 865db2c709db..beab081283fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1cae4a8786c5515b523907d01f41f126
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2
deleted file mode 100644
index bfae01008f98..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3
deleted file mode 100644
index 36e00a379ff8..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uwimap
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=45b039b06f29fc51361bf0cb42a70727
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1
index be610fe86ba7..18eb30fce3a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2d5fbc5d19a4dc7c01685a470c8761a8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2
index aedab8b83492..fda72758f426 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=2d5fbc5d19a4dc7c01685a470c8761a8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3
index ad0a2846a95b..de4256902752 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48f8fd888b19c4504a48875f25791d8c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180701-r1
new file mode 100644
index 000000000000..d292a92a66cb
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uwimap
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=48f8fd888b19c4504a48875f25791d8c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-9999 b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
index f1f3cb171793..369fae356cfc 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=48f8fd888b19c4504a48875f25791d8c
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2
deleted file mode 100644
index 3d335a2b5fa4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3
deleted file mode 100644
index 32cc44513bd4..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for uWSGI
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=e0e9d87148e12b8f8a701f2c39a54a57
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1
index 1a6133793ee1..dde421c36e9a 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=338efaf879a5143a696bfef6d465cfb9
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2
index 9419be1cb78f..204f5a8359df 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=338efaf879a5143a696bfef6d465cfb9
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3
index 5a67795fe9b2..8a6ecb4793e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=faeda3a0505e659893d03f30a168acb8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180701-r1
new file mode 100644
index 000000000000..b143894177d6
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for uWSGI
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=faeda3a0505e659893d03f30a168acb8
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-9999 b/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
index 27a57838a4b2..1a6d421fd250 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=faeda3a0505e659893d03f30a168acb8
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2
deleted file mode 100644
index abbe7279c9a6..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3
deleted file mode 100644
index 3928b40e6880..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for varnishd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fe15cab3d68b23d184753ca5c6b0e681
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1
index 3247464f48b0..556b0a16d396 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8065ea09e1c55f37cfbde9133e826afe
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2
index d0452ee40e1e..218938b367bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8065ea09e1c55f37cfbde9133e826afe
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3
index 38c8d7588c7c..58fbf60f4c1b 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f56703b25180d75c53cde6644a55c17e
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180701-r1
new file mode 100644
index 000000000000..98eb7317be9e
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for varnishd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f56703b25180d75c53cde6644a55c17e
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-9999 b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
index f12c1fc3d5f7..699a1765a238 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f56703b25180d75c53cde6644a55c17e
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2
deleted file mode 100644
index 4063b3bf326b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3
deleted file mode 100644
index 67586263dbb0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vbetool
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=4f57ec4ad3f4916d71c1d112d30b0878
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1
index d7a8f8917c13..3e0ed520eaff 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=80c3eec7180096c0a960edd106aa3a76
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2
index c6ee70d1524d..bbe3f148f432 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=80c3eec7180096c0a960edd106aa3a76
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3
index 7e5a15235bdc..fa8bb7c00d8d 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c0d63f31b846cd046894e5d5778ec430
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180701-r1
new file mode 100644
index 000000000000..8e1af5835776
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vbetool
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=c0d63f31b846cd046894e5d5778ec430
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-9999 b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
index c7bf7a5da7c2..5019e8b58c0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=c0d63f31b846cd046894e5d5778ec430
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2
deleted file mode 100644
index bfd460a875cd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3
deleted file mode 100644
index 78db89698b22..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vdagent
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=a5cdba7ef5f0f4641b22acc724814b9f
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1
index 47061ba0d049..650eb6507d9a 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8dba1b76264d76451ddeb81e7bea2442
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2
index 605a37c78ae9..b1eccee7a8ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=8dba1b76264d76451ddeb81e7bea2442
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3
index 5871de11aebb..f14ef500379e 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=912761f8da712c34a762b437692eb45d
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180701-r1
new file mode 100644
index 000000000000..bf14427fa132
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vdagent
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=912761f8da712c34a762b437692eb45d
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-9999 b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
index 6c549fa87456..7e3225ff7501 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=912761f8da712c34a762b437692eb45d
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2
deleted file mode 100644
index d8abd5766aec..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3
deleted file mode 100644
index a8e45a9e81c1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vde
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=95a8ff7af90a0dd90801c101ded71449
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1
index f88b39793f0c..073b95097e31 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=63452846420096e0cff9901bb8181c1d
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2
index 1c40261b68b5..9ee6967a18da 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=63452846420096e0cff9901bb8181c1d
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3
index 5c4e470484b1..005d0abaff00 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4b41f45db34d4accc2dd7108b166729
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vde-2.20180701-r1
new file mode 100644
index 000000000000..8af9926b5746
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vde
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=b4b41f45db34d4accc2dd7108b166729
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-9999 b/metadata/md5-cache/sec-policy/selinux-vde-9999
index 8fb5836e6578..786446ac1a66 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vde-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4b41f45db34d4accc2dd7108b166729
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2
deleted file mode 100644
index 4f70a2951127..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3
deleted file mode 100644
index 589a421c79d1..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for virt
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b5b142140239a85b1df152f393e7112b
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1
index 38ac2099967b..fcf19f6976b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=248bfd7e4eedafe36ca1e420b7f9354d
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2
index e7124b8029f9..9e541115ebbd 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=248bfd7e4eedafe36ca1e420b7f9354d
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3
index 58d60d3cce03..a9ee312535a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bfedd578d18d225fe95738c783c2c59e
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-virt-2.20180701-r1
new file mode 100644
index 000000000000..3c7a7174899b
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for virt
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=bfedd578d18d225fe95738c783c2c59e
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-9999 b/metadata/md5-cache/sec-policy/selinux-virt-9999
index f463bf47af2a..fa5c8296e723 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-virt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bfedd578d18d225fe95738c783c2c59e
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2
deleted file mode 100644
index 364b14059fcf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3
deleted file mode 100644
index 6d770c9f417a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vlock
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d1b7626de2f7da83e11082bb203118e8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1
index 5b91c8a1821e..2468bd727be8 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b54928a3f9daf3efa42d776aba92e134
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2
index 1b7ee670c27a..eae4726cb881 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b54928a3f9daf3efa42d776aba92e134
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3
index e52927554778..4ccc9b969381 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=99d1d8a439b349f16429e4f93975d00d
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180701-r1
new file mode 100644
index 000000000000..76b9db79a0de
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vlock
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=99d1d8a439b349f16429e4f93975d00d
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-9999 b/metadata/md5-cache/sec-policy/selinux-vlock-9999
index 9abae4f279a4..43aca54d124e 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=99d1d8a439b349f16429e4f93975d00d
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2
deleted file mode 100644
index 712c4e791280..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3
deleted file mode 100644
index 3e01a0c75d6f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vmware
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=46ae649937a98ab21481cf99b3a4505f
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1
index 14a95ced1e6f..03c9b352f4a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7eff20d7250ace3864c4096b8a49bce3
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2
index 64be07efe3e6..4dfd6fdb31cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=7eff20d7250ace3864c4096b8a49bce3
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3
index c477451c7f70..ed60ceb03d3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cab09bfa6b583dab36cf1e2bde3c3fae
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180701-r1
new file mode 100644
index 000000000000..f3128ffb5cfd
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vmware
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=cab09bfa6b583dab36cf1e2bde3c3fae
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-9999 b/metadata/md5-cache/sec-policy/selinux-vmware-9999
index 0618a115d87b..954f283acc3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=cab09bfa6b583dab36cf1e2bde3c3fae
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2
deleted file mode 100644
index 1c1d1a25b774..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3
deleted file mode 100644
index 99851e85a053..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vnstatd
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=512c7e52acc6c4813259780b484e360f
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1
index ae6ac8d9fbe6..4636e9365a3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=36a7fb1d09f71465bf77fb6b039b1370
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2
index 63f7b9acc2b8..c0569b36677a 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=36a7fb1d09f71465bf77fb6b039b1370
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3
index 95671778b416..6f9c52bacb80 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=17c44f9f3b04f2af51fba615ef4c6655
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180701-r1
new file mode 100644
index 000000000000..ed88670d669c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vnstatd
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=17c44f9f3b04f2af51fba615ef4c6655
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999 b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
index a557c8559a4d..aeed06413c64 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=17c44f9f3b04f2af51fba615ef4c6655
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2
deleted file mode 100644
index 5cb4aeb97d9b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3
deleted file mode 100644
index 2cefe75cf02f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for vpn
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=fb6109966101dbdde720be22478bde6d
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1
index 8fdc1de2c093..57714c446b07 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9a870e0f1e5c9911be75a5142030ce66
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2
index dc57855330a0..df56cda632ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=9a870e0f1e5c9911be75a5142030ce66
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3
index 42160485ac6b..2dd1f639d695 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5280af600a23b9fe6fddfdbac80cd084
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180701-r1
new file mode 100644
index 000000000000..8346b1972be0
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for vpn
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=5280af600a23b9fe6fddfdbac80cd084
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-9999 b/metadata/md5-cache/sec-policy/selinux-vpn-9999
index d07dff042557..e67db307bcfc 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=5280af600a23b9fe6fddfdbac80cd084
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2
deleted file mode 100644
index ee5c242ddc4a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3
deleted file mode 100644
index 7d0e72fd640f..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for watchdog
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=c0c816040d223c82cc4015ddb97fe7fc
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1
index 8bdf78643a4a..eeab956dc0fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=183548edba137fae99e1cf01ff7b9afb
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2
index 308cc446431e..3b665a2c7f8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=183548edba137fae99e1cf01ff7b9afb
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3
index 7d9abcc8bb55..5a1ca23833f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fa00f5fae9525d91bc1782efa8feab6d
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180701-r1
new file mode 100644
index 000000000000..f79d74cfccd7
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for watchdog
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=fa00f5fae9525d91bc1782efa8feab6d
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-9999 b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
index 4ad5d63156fe..43ca2c277172 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=fa00f5fae9525d91bc1782efa8feab6d
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2
deleted file mode 100644
index 71bf35b2893a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3
deleted file mode 100644
index fa1614c63e12..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for webalizer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=038e661730e50c3cfcceeae5ae73fd14
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1
index 870af0403c5b..d7b1a2f45203 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25638ab68242a0db0ea3fac7895db64b
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2
index 8d54d506f9e3..f53527cb9697 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=25638ab68242a0db0ea3fac7895db64b
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3
index 1c15f7da1de2..ab1f4f07e3bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3dafd4d9c9a637b3a00c599a24462e5
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180701-r1
new file mode 100644
index 000000000000..44e9ffbc21e9
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for webalizer
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=f3dafd4d9c9a637b3a00c599a24462e5
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-9999 b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
index 24805d734aae..4201337e4443 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f3dafd4d9c9a637b3a00c599a24462e5
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2
deleted file mode 100644
index 895224a95b83..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3
deleted file mode 100644
index c87ce1ac7f8e..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wine
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=d886b4e076502036aa174615569a36eb
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1
index 19bab92ec7b7..544fed19989b 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=04710e2a3cc5698a3df01d039a6c4d1a
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2
index cee5876ab27f..abc5f856a7ea 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=04710e2a3cc5698a3df01d039a6c4d1a
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3
index fcc16bc1185d..28e989531a92 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1cdfe30ea1368ac6638dac65bf11f9cd
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-wine-2.20180701-r1
new file mode 100644
index 000000000000..d243402adcae
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wine
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=1cdfe30ea1368ac6638dac65bf11f9cd
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-9999 b/metadata/md5-cache/sec-policy/selinux-wine-9999
index 5b40b06ee6de..5c49427f9382 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wine-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=1cdfe30ea1368ac6638dac65bf11f9cd
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2
deleted file mode 100644
index a901539818eb..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3
deleted file mode 100644
index 2680126bfb2b..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wireshark
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=521526236d1c543cad578129c3acf25e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1
index 4d003aa5263b..0420594ccedd 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4ec2e731a4cfd04a3defe6f4a84c188
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2
index b035ee16d915..34d4fad3c5e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=b4ec2e731a4cfd04a3defe6f4a84c188
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3
index 7d19dcb503d0..f63da9f21762 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ce0f6315d5ab917dd57b1ea9653e4081
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180701-r1
new file mode 100644
index 000000000000..4ea24a807f30
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wireshark
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ce0f6315d5ab917dd57b1ea9653e4081
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-9999 b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
index 225d01689bcd..f9dd40c6652a 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ce0f6315d5ab917dd57b1ea9653e4081
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2
deleted file mode 100644
index 36bc95895efd..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3
deleted file mode 100644
index 9a528b9f4662..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for wm
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=22ae60ee07b23c3db23d75d030072dce
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1
index 2733018142c5..0a005d54f87a 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f592ee913380e439017dd50429ca2e51
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2
index b04cffbc5456..a8d947a450e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=f592ee913380e439017dd50429ca2e51
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3
index 82cb477bcda8..461e4b72cb9d 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3054e6df1fec59f8648bf78436bacae4
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-wm-2.20180701-r1
new file mode 100644
index 000000000000..c111c95babb8
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for wm
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=3054e6df1fec59f8648bf78436bacae4
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-9999 b/metadata/md5-cache/sec-policy/selinux-wm-9999
index d413a4d37cba..eb013e5f8e1e 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=3054e6df1fec59f8648bf78436bacae4
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2
deleted file mode 100644
index 5e967a89347c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3
deleted file mode 100644
index 4580aeaff366..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xen
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=541f70379a54cf96d89cd9c1571bbc6e
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1
index c53a2016d008..d56d7fc57376 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bb7eb4b63283d8f3429bcab1ade852f7
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2
index dba9badba57e..8b07bef58125 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=bb7eb4b63283d8f3429bcab1ade852f7
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3
index 3a999c2cadce..78ef5e41a6c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d708be8254c84d64feb1f1629c34ab71
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-xen-2.20180701-r1
new file mode 100644
index 000000000000..95fcba72d2c4
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xen
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=d708be8254c84d64feb1f1629c34ab71
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-9999 b/metadata/md5-cache/sec-policy/selinux-xen-9999
index 34fe02641d2a..01fc8685c067 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=d708be8254c84d64feb1f1629c34ab71
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2
deleted file mode 100644
index 8d082fa80fea..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3
deleted file mode 100644
index 053f7e15bebf..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xfs
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b507f218aa29f17085029fece0ea8237
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1
index 5d492c7da5ca..34965a5fca5d 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ba40b0b0d8b32de31c3f96c086b65f8f
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2
index 598a2b94d41d..9adfd9f0ac19 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ba40b0b0d8b32de31c3f96c086b65f8f
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3
index 05be9b0d65b4..11a39f036806 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0fcd8259afda1cef89cb3bf824edd6f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180701-r1
new file mode 100644
index 000000000000..4bc6e24f90f2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xfs
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=0fcd8259afda1cef89cb3bf824edd6f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-9999 b/metadata/md5-cache/sec-policy/selinux-xfs-9999
index 8f647c83e0a9..d19db7cc7376 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=0fcd8259afda1cef89cb3bf824edd6f5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2
deleted file mode 100644
index 65d8cabc48be..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3
deleted file mode 100644
index d9086d947b34..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xprint
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=b5d92a29da8e0e5f1dc6a1cd473502d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1
index 990d30cea6ca..fe832dbe77cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e8e74be5bcc129cf987b4c566756b320
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2
index f79ae9c5334a..194e97663dd4 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=e8e74be5bcc129cf987b4c566756b320
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3
index 29379b8ee832..90ff50e32f8b 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ea59eeca20d494f83411f75e5fffd3d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180701-r1
new file mode 100644
index 000000000000..f50489aea95c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xprint
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=ea59eeca20d494f83411f75e5fffd3d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-9999 b/metadata/md5-cache/sec-policy/selinux-xprint-9999
index d200675463aa..5f1a2e3df885 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=ea59eeca20d494f83411f75e5fffd3d5
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2
deleted file mode 100644
index cb82721135f0..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3
deleted file mode 100644
index d8c07e219664..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xscreensaver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=5fd7800afabb16291a604e0b1520bea8
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1
index 68f221d67bcc..d48ccbe72cf1 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=355355eee8effa6a24efcdd15007da62
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2
index 53bc17207900..a231d5e799bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=355355eee8effa6a24efcdd15007da62
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3
index 6396a372b725..673d57bf860e 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=51cb5d02087042cee35b9b7ed422fc8b
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180701-r1
new file mode 100644
index 000000000000..8560087d5229
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xscreensaver
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=51cb5d02087042cee35b9b7ed422fc8b
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
index ad6dd7e61824..582c779f3dac 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=51cb5d02087042cee35b9b7ed422fc8b
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2
deleted file mode 100644
index 8095c0d84b5a..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3
deleted file mode 100644
index 83dea375ee1c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for xserver
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=daaa30887ef97b80f69ecbffd1b2aace
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1
index 18bb0c9dd369..9d53255931b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=109011428b70ad9fda0e766ecbeed035
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2
index 001246cecabc..2f1120ad649e 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=109011428b70ad9fda0e766ecbeed035
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3
index 5c68d7237353..0d9432abb295 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=18d6c0a97cd9de911fbc7364fc72072a
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180701-r1
new file mode 100644
index 000000000000..6f8b6440f3a2
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for xserver
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=18d6c0a97cd9de911fbc7364fc72072a
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-9999 b/metadata/md5-cache/sec-policy/selinux-xserver-9999
index a8e72ead1824..ac0901167ecb 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=18d6c0a97cd9de911fbc7364fc72072a
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2
deleted file mode 100644
index ba2957106f83..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3
deleted file mode 100644
index 1b7795e29163..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20170805-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for zabbix
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20170805-r3
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20170805.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
-_md5_=2ba64b52850ce934d0570499d15db3fe
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1
index 9ed3fdaa5edc..759b54c830e2 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=881a91f5285a8989d1e7b6cd43303aef
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2
index 4f838bb51138..a6f18238900b 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=881a91f5285a8989d1e7b6cd43303aef
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3
index 198c3100d793..95ffa89e0b3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180114-r3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=af6aae69b03bae0dcd08e5d0d62b1760
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180701-r1
new file mode 100644
index 000000000000..003d41b37e4c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20180701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for zabbix
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
+_eclasses_=selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
+_md5_=af6aae69b03bae0dcd08e5d0d62b1760
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-9999 b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
index 9212430d176f..e7d196d53137 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	c32ee7308f2bc9b7f2ebdbbf9a17316d
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	selinux-policy-2	e7b396fb2057f9eb5785a7a3539613aa
 _md5_=af6aae69b03bae0dcd08e5d0d62b1760
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 48e64ea27b9c..4fedc4d9998f 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.29-r1 b/metadata/md5-cache/sys-apps/coreutils-8.29-r1
index b4978cb96f10..55c0a1d5ed0f 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.29-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.29-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,.
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/coreutils/
 IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.29.tar.xz mirror://gentoo/coreutils-8.29-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/coreutils/coreutils-8.29-patches-1.0.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0be588e98b020873d9e561fe5f7298a3
+_md5_=b76d9c5968273384ab84fb1e9d2f974f
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.6 b/metadata/md5-cache/sys-apps/fwupd-1.0.6
deleted file mode 100644
index 472cc9f559fe..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.6.13:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( net-libs/gnutls:= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=6
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.6.13:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( net-libs/gnutls:= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
-REQUIRED_USE=dell? ( uefi )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.6.tar.gz -> fwupd-1.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db94b91ad469f6fcee7e8aa3ff9f7f1d
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.8 b/metadata/md5-cache/sys-apps/fwupd-1.0.8
deleted file mode 100644
index ef95ca516e3e..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-10 ) uefi_labels? ( x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive >=dev-util/meson-0.41.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] )
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=6
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-10 ) uefi_labels? ( x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
-REQUIRED_USE=dell? ( uefi )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.8.tar.gz -> fwupd-1.0.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92fda95088f1b6c5e4a63ce567304115
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.1.0 b/metadata/md5-cache/sys-apps/fwupd-1.1.0
new file mode 100644
index 000000000000..8cc0e87c1b2e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( media-libs/fontconfig media-libs/freetype >=sys-libs/efivar-33 x11-libs/cairo ) app-arch/gcab app-arch/libarchive >=dev-util/meson-0.41.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] )
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=6
+HOMEPAGE=https://fwupd.org
+IUSE=colorhug dell doc gpg +man pkcs7 redfish systemd test uefi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( media-libs/fontconfig media-libs/freetype >=sys-libs/efivar-33 x11-libs/cairo )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) dell? ( uefi )
+SLOT=0
+SRC_URI=https://github.com/hughsie/fwupd/archive/1.1.0.tar.gz -> fwupd-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef11fe2510bf04f5b3880252ce19124d
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.6.1 b/metadata/md5-cache/sys-apps/pciutils-3.6.1
new file mode 100644
index 000000000000..252419b00beb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pciutils-3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
+DESCRIPTION=Various utilities dealing with the PCI bus
+EAPI=6
+HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwids
+SLOT=0
+SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.6.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2b4d384f9a06cfe8b323a901e0c143bf
diff --git a/metadata/md5-cache/sys-apps/sed-4.2.2 b/metadata/md5-cache/sys-apps/sed-4.2.2
deleted file mode 100644
index 8c2477b63c85..000000000000
--- a/metadata/md5-cache/sys-apps/sed-4.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) nls? ( sys-devel/gettext )
-DESCRIPTION=Super-useful stream editor
-EAPI=5
-HOMEPAGE=http://sed.sourceforge.net/
-IUSE=acl nls selinux static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://gnu/sed/sed-4.2.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ebece86cf7d45093a8bf6ea6120f40b
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.32-r4 b/metadata/md5-cache/sys-apps/util-linux-2.32-r4
index 9435a79a7bd1..c1e572b0636c 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.32-r4
+++ b/metadata/md5-cache/sys-apps/util-linux-2.32-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.32/util-linux-2.32.tar.xz
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8833bff701e0ba562b9278f5653e4831
+_md5_=3369bde04c07d244a5e405a381039292
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d2fa7f1b9b0e..168e88ea73e6 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-0.1 b/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
deleted file mode 100644
index 6d68963b3465..000000000000
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig media-libs/libmtp >=sys-fs/fuse-2.8 >=app-portage/elt-patches-20170422
-DESCRIPTION=Simple MTP fuse filesystem driver
-EAPI=5
-HOMEPAGE=https://github.com/phatina/simple-mtpfs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libmtp >=sys-fs/fuse-2.8
-SLOT=0
-SRC_URI=mirror://github/phatina/simple-mtpfs/simple-mtpfs-0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=024d27db3c569e67033c8e05444e024c
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7acda1159b85..624ad5dec523 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/python-typing-0 b/metadata/md5-cache/virtual/python-typing-0
deleted file mode 100644
index 927ed96b7d39..000000000000
--- a/metadata/md5-cache/virtual/python-typing-0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for the Python typing module
-EAPI=6
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_pypy3? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] )
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3226822cc743d772b4d4db9d6b1df44c
diff --git a/metadata/md5-cache/virtual/python-typing-0-r1 b/metadata/md5-cache/virtual/python-typing-0-r1
new file mode 100644
index 000000000000..5c61aa698d7c
--- /dev/null
+++ b/metadata/md5-cache/virtual/python-typing-0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for the Python typing module
+EAPI=6
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/typing[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] )
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=fce0ddfc03f796fb9877d5edb9fbbb1b
diff --git a/metadata/md5-cache/virtual/rust-1.27.1 b/metadata/md5-cache/virtual/rust-1.27.1
new file mode 100644
index 000000000000..ed831ed4d0da
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.27.1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.27.1* =dev-lang/rust-bin-1.27.1* )
+SLOT=0
+_md5_=972f1fbb9112b560e518e3b6a04d92d4
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 68c6bb7d85f7..604e61b3ee8f 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/cgp-1_p20180620 b/metadata/md5-cache/www-apps/cgp-1_p20180620
new file mode 100644
index 000000000000..0b3e553a8585
--- /dev/null
+++ b/metadata/md5-cache/www-apps/cgp-1_p20180620
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A graphical web-based front-end for visualizing RRD collected by collectd
+EAPI=6
+HOMEPAGE=https://github.com/pommi/CGP https://pommi.nethuis.nl/category/cgp/
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-2.0 GPL-2+ GPL-3 MIT
+RDEPEND=dev-lang/php[json] net-analyzer/rrdtool[graph] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=1_p20180620
+SRC_URI=https://github.com/pommi/CGP/archive/1920ca24a067ac157a6bd8f3c017f4c6244ae245.tar.gz -> cgp-1_p20180620.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=2205e944bfa4429095c0419edd275dd4
diff --git a/metadata/md5-cache/www-apps/hugo-0.44 b/metadata/md5-cache/www-apps/hugo-0.44
new file mode 100644
index 000000000000..9b60adbd330f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.44
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A Fast and Flexible Static Site Generator built with love in Go
+EAPI=6
+HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
+IUSE=sass
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.44.tar.gz -> hugo-0.44.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz -> github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0470d980c34b879e566ef31607f64ca4
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.2.10 b/metadata/md5-cache/www-apps/phpsysinfo-3.2.10
new file mode 100644
index 000000000000..52aa409e15b6
--- /dev/null
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A customizable PHP script that displays information about your system nicely
+EAPI=6
+HOMEPAGE=https://rk4an.github.com/phpsysinfo/
+IUSE=apcupsd dmraid freeipmi hddtemp ipmitool ipmiutil iptables lm_sensors mdadm megactl nut quota smart snmp uptime vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php apcupsd? ( sys-power/apcupsd ) dmraid? ( sys-fs/dmraid ) freeipmi? ( sys-libs/freeipmi ) hddtemp? ( app-admin/hddtemp ) ipmitool? ( sys-apps/ipmitool ) ipmiutil? ( sys-apps/ipmiutil ) iptables? ( net-firewall/iptables ) lm_sensors? ( sys-apps/lm_sensors ) mdadm? ( sys-fs/mdadm ) megactl? ( sys-block/megactl ) nut? ( sys-power/nut ) quota? ( sys-fs/quota ) smart? ( sys-apps/smartmontools ) snmp? ( net-analyzer/net-snmp ) uptime? ( app-misc/uptimed ) >=app-admin/webapp-config-1.50.15
+SLOT=3.2.10
+SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.2.10.tar.gz -> phpsysinfo-3.2.10.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=31135705415d79bdd146ca20eee41a17
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e57399c8026d..4ed329ab376b 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-61.0-r1 b/metadata/md5-cache/www-client/firefox-61.0-r1
index 573efcb78d7e..fd43deb006ea 100644
--- a/metadata/md5-cache/www-client/firefox-61.0-r1
+++ b/metadata/md5-cache/www-client/firefox-61.0-r1
@@ -11,4 +11,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ach.xpi -> firefox-61.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/af.xpi -> firefox-61.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/an.xpi -> firefox-61.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ar.xpi -> firefox-61.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/as.xpi -> firefox-61.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ast.xpi -> firefox-61.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/az.xpi -> firefox-61.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bg.xpi -> firefox-61.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bn-BD.xpi -> firefox-61.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bn-IN.xpi -> firefox-61.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/br.xpi -> firefox-61.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/bs.xpi -> firefox-61.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ca.xpi -> firefox-61.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/cak.xpi -> firefox-61.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/cs.xpi -> firefox-61.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/cy.xpi -> firefox-61.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/da.xpi -> firefox-61.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/de.xpi -> firefox-61.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/dsb.xpi -> firefox-61.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/el.xpi -> firefox-61.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/en-GB.xpi -> firefox-61.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/en-ZA.xpi -> firefox-61.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/eo.xpi -> firefox-61.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-AR.xpi -> firefox-61.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-CL.xpi -> firefox-61.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-ES.xpi -> firefox-61.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/es-MX.xpi -> firefox-61.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/et.xpi -> firefox-61.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/eu.xpi -> firefox-61.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fa.xpi -> firefox-61.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ff.xpi -> firefox-61.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fi.xpi -> firefox-61.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fr.xpi -> firefox-61.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/fy-NL.xpi -> firefox-61.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ga-IE.xpi -> firefox-61.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gd.xpi -> firefox-61.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gl.xpi -> firefox-61.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gn.xpi -> firefox-61.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/gu-IN.xpi -> firefox-61.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/he.xpi -> firefox-61.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hi-IN.xpi -> firefox-61.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hr.xpi -> firefox-61.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hsb.xpi -> firefox-61.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hu.xpi -> firefox-61.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/hy-AM.xpi -> firefox-61.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/id.xpi -> firefox-61.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/is.xpi -> firefox-61.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/it.xpi -> firefox-61.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ja.xpi -> firefox-61.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ka.xpi -> firefox-61.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/kab.xpi -> firefox-61.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/kk.xpi -> firefox-61.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/km.xpi -> firefox-61.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/kn.xpi -> firefox-61.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ko.xpi -> firefox-61.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/lij.xpi -> firefox-61.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/lt.xpi -> firefox-61.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/lv.xpi -> firefox-61.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/mai.xpi -> firefox-61.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/mk.xpi -> firefox-61.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ml.xpi -> firefox-61.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/mr.xpi -> firefox-61.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ms.xpi -> firefox-61.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/nb-NO.xpi -> firefox-61.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/nl.xpi -> firefox-61.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/nn-NO.xpi -> firefox-61.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/or.xpi -> firefox-61.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pa-IN.xpi -> firefox-61.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pl.xpi -> firefox-61.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pt-BR.xpi -> firefox-61.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/pt-PT.xpi -> firefox-61.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/rm.xpi -> firefox-61.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ro.xpi -> firefox-61.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ru.xpi -> firefox-61.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/si.xpi -> firefox-61.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sk.xpi -> firefox-61.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sl.xpi -> firefox-61.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/son.xpi -> firefox-61.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sq.xpi -> firefox-61.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sr.xpi -> firefox-61.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/sv-SE.xpi -> firefox-61.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/ta.xpi -> firefox-61.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/te.xpi -> firefox-61.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/th.xpi -> firefox-61.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/tr.xpi -> firefox-61.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/uk.xpi -> firefox-61.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/uz.xpi -> firefox-61.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/vi.xpi -> firefox-61.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/xh.xpi -> firefox-61.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/zh-CN.xpi -> firefox-61.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/61.0/linux-i686/xpi/zh-TW.xpi -> firefox-61.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/61.0/source/firefox-61.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-61.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-61.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-61.0-patches-01.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	6e50ef9c43ba6d6a8edb89393ad56ad0	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7435bcc95a3181ce6493d8a4abccac2d
+_md5_=68d60d9a1343cda24cb99c6776f45482
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4f47a3f28b08..c1fd7c8a6d2f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jul 2018 03:38:28 +0000
+Fri, 13 Jul 2018 13:08:32 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 3fce562bcbc1..3fe6f92b9ffc 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -716,8 +716,8 @@
       <role>Council member</role>
     </member>
     <member>
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
+      <email>leio@gentoo.org</email>
+      <name>Mart Raudsepp</name>
       <role>Council member</role>
     </member>
     <member>
@@ -726,13 +726,13 @@
       <role>Council member</role>
     </member>
     <member>
-      <email>tamiko@gentoo.org</email>
-      <name>Matthias Maier</name>
+      <email>ulm@gentoo.org</email>
+      <name>Ulrich Müller</name>
       <role>Council member</role>
     </member>
     <member>
-      <email>ulm@gentoo.org</email>
-      <name>Ulrich Müller</name>
+      <email>whissi@gentoo.org</email>
+      <name>Thomas Deutschmann</name>
       <role>Council member</role>
     </member>
     <member>
@@ -3447,12 +3447,12 @@ developers and volunteer mentors.</description>
     <name>SELinux</name>
     <url>https://wiki.gentoo.org/wiki/Project:SELinux</url>
     <description>This project manages SELinux support in Gentoo. This includes providing kernels with SELinux support, providing patches to userland utilities, writing strong Gentoo-specific default profiles, and maintaining a good default set of policies.</description>
-    <member>
+    <member is-lead="1">
       <email>perfinion@gentoo.org</email>
       <name>Jason Zaman</name>
       <role>Documentation, Policy, Userland</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>swift@gentoo.org</email>
       <name>Sven Vermeulen</name>
       <role>Documentation, Policy, Userland</role>
@@ -3960,6 +3960,11 @@ developers and volunteer mentors.</description>
       <name>Amy Liffey</name>
       <role>Member</role>
     </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Member (who is not lead)</role>
+    </member>
     <member is-lead="1">
       <email>pacho@gentoo.org</email>
       <name>Pacho Ramos</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index c5500ad93a52..873eff71fdec 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul 12 03:38:28 UTC 2018
+Fri Jul 13 13:08:32 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bf85d710622d..8ddec6a1857f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jul 2018 04:00:01 +0000
+Fri, 13 Jul 2018 13:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2266d6487a02..178a83271d98 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-44b9278a1cb40ebae2ce038ccf97bae83ed786ac 1531364241 2018-07-12T02:57:21+00:00
+bcaff0dd011274c3f2fd11b7d03c0e040d38cb31 1531486771 2018-07-13T12:59:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b9fe28fcc420..97de07137f35 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1531366501 Thu 12 Jul 2018 03:35:01 AM UTC
+1531487101 Fri 13 Jul 2018 01:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4f47a3f28b08..c1fd7c8a6d2f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 12 Jul 2018 03:38:28 +0000
+Fri, 13 Jul 2018 13:08:32 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e7f36d83e0eb..a81ec45b844d 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..508d1a24e804
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	mv ${PN}.py ${PN} || die
+
+	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild
deleted file mode 100644
index 992274b0ce37..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils python-r1 distutils-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_p/-}"
-
-DESCRIPTION="status monitor for the desktop"
-DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
-HOMEPAGE="https://nagstamon.ifw-dresden.de"
-SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
-	dev-python/requests-kerberos[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
-
-src_prepare() {
-	default_src_prepare
-
-	mv ${PN}.py ${PN} || die
-
-	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index fdb76922df39..3d323b1f6012 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
new file mode 100644
index 000000000000..2bb7546fcfa5
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
@@ -0,0 +1,16 @@
+diff -ur a/stubby/systemd/stubby.service b/stubby/systemd/stubby.service
+--- a/stubby/systemd/stubby.service	2018-05-11 13:25:22.000000000 +0200
++++ b/stubby/systemd/stubby.service	2018-06-20 15:40:23.650164668 +0200
+@@ -3,9 +3,11 @@
+ 
+ [Service]
+ User=stubby
+-DynamicUser=yes
++DynamicUser=no
+ CacheDirectory=stubby
+ WorkingDirectory=/var/cache/stubby
++ExecStartPre=/bin/mkdir -p /var/cache/stubby
++ExecStartPre=/bin/chown stubby:stubby /var/cache/stubby
+ ExecStart=/usr/bin/stubby
+ AmbientCapabilities=CAP_NET_BIND_SERVICE
+ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
diff --git a/net-dns/getdns/getdns-1.4.2-r1.ebuild b/net-dns/getdns/getdns-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..28d7a6c9c3c9
--- /dev/null
+++ b/net-dns/getdns/getdns-1.4.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user fcaps systemd
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs"
+
+DEPEND="
+	dev-libs/libbsd:=
+	dev-libs/libyaml:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	idn? ( net-dns/libidn2:= )
+	unbound? ( >=net-dns/unbound-1.4.16:= )
+	libevent? ( dev-libs/libevent:= )
+	libev? ( dev-libs/libev:= )
+	libuv? ( dev-libs/libuv:= )
+"
+RDEPEND="
+	${DEPEND}
+	stubby? ( sys-libs/libcap:= )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
+src_configure() {
+	econf \
+		--runstatedir=/var/run \
+		--with-piddir=/var/run/stubby \
+		$(use_with stubby) \
+		$(use_with getdns_query) \
+		$(use_with getdns_server_mon) \
+		$(use_with idn libidn2) \
+		--without-libidn \
+		$(use_with unbound libunbound) \
+		$(use_with libevent) \
+		$(use_with libev) \
+		$(use_with libuv) \
+		$(use_with threads libpthread) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
+	fi
+}
+
+pkg_postinst() {
+	if use stubby; then
+		enewgroup stubby
+		enewuser stubby -1 -1 -1 stubby
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+	fi
+
+	if has_version <dev-libs/libressl-2.7.0; then
+		ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
+		if use stubby; then
+			ewarn "You will NOT be able to use strict profile in Stubby."
+		fi
+	fi
+}
diff --git a/net-dns/getdns/getdns-1.4.2.ebuild b/net-dns/getdns/getdns-1.4.2.ebuild
deleted file mode 100644
index c0978a76f061..000000000000
--- a/net-dns/getdns/getdns-1.4.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user fcaps systemd
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs"
-
-DEPEND="
-	dev-libs/libbsd:=
-	dev-libs/libyaml:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	idn? ( net-dns/libidn2:= )
-	unbound? ( >=net-dns/unbound-1.4.16:= )
-	libevent? ( dev-libs/libevent:= )
-	libev? ( dev-libs/libev:= )
-	libuv? ( dev-libs/libuv:= )
-"
-RDEPEND="
-	${DEPEND}
-	stubby? ( sys-libs/libcap:= )
-"
-
-src_configure() {
-	econf \
-		--runstatedir=/var/run \
-		--with-piddir=/var/run/stubby \
-		$(use_with stubby) \
-		$(use_with getdns_query) \
-		$(use_with getdns_server_mon) \
-		$(use_with idn libidn2) \
-		--without-libidn \
-		$(use_with unbound libunbound) \
-		$(use_with libevent) \
-		$(use_with libev) \
-		$(use_with libuv) \
-		$(use_with threads libpthread)
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		enewgroup stubby
-		enewuser stubby -1 -1 -1 stubby
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-
-	if has_version <dev-libs/libressl-2.7.0; then
-		ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
-		if use stubby; then
-			ewarn "You will NOT be able to use strict profile in Stubby."
-		fi
-	fi
-}
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index d3d63dc1c223..544eb05882eb 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,3 +1,3 @@
 DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
 DIST knot-2.6.6.tar.xz 1120340 BLAKE2B 374d9b78f2ef2143d1221fced29184a52ee3773abd7cb08b6b48910f6ffc0f7c4f07c00d17d28344c93d71a709363bdf855d20587f87da622153c44d08d85fd8 SHA512 bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972
-DIST knot-2.6.7.tar.xz 1121120 BLAKE2B c3000a08a8d873efc5a120d0f0154bcd16be0162ce3c21d74041181183c5f6f1600eeab3546737591ccd1522c8119202dc1f7dd576b70d4c006c0619b904f54a SHA512 021810b396e9aaca140c6df858c8dcb9a4be6ac8d64a413195b88d8073d39e1de0604058343bff7534d39f32de27b0e0bc2271a0e545bb9f809adfe1bfaec9a9
+DIST knot-2.6.8.tar.xz 1121740 BLAKE2B 2da7e20630fec53952c6892ee4002afeee0c36ef5cb271346caf1760389abaacac7f11dd0b24950ff5eedca40564ccf70c25b5c8548564bdd61c78a1bd9cf93e SHA512 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967
diff --git a/net-dns/knot/knot-2.6.7.ebuild b/net-dns/knot/knot-2.6.8.ebuild
similarity index 100%
rename from net-dns/knot/knot-2.6.7.ebuild
rename to net-dns/knot/knot-2.6.8.ebuild
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9628a508c5d3..c2c63b822512 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/err/err-1.7.1-r1.ebuild b/net-im/err/err-1.7.1-r1.ebuild
deleted file mode 100644
index ebb937892546..000000000000
--- a/net-im/err/err-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
-HOMEPAGE="https://gbin.github.com/err/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +plugins"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyfire[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/xmpppy[${PYTHON_USEDEP}]
-	dev-python/yapsy[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-		dev-python/twisted-words[${PYTHON_USEDEP}]
-	)
-	plugins? ( dev-vcs/git )"
-
-# Testsuite is broken since 1.6.3
-RESTRICT="test"
-
-# NOTES:
-# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
-# 2. Support for BOT_SENTRY option is missing, cause
-#    we do not have apropriate packages in portage yet
-# 3. Internal web server is broken(dunno why :-()
-
-pkg_setup() {
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
-}
-
-python_prepare_all() {
-	# Remove configparser and config from requirements as they are NOT needed
-	sed -i \
-		-e "/install_requires/s/'configparser', //" \
-		-e "/install_requires/s/, 'config'//" \
-		setup.py || die
-
-	# Tests are broken and should not be installed
-	rm -r tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	dodir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}
diff --git a/net-im/err/err-1.7.1-r2.ebuild b/net-im/err/err-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..6ed14b926aec
--- /dev/null
+++ b/net-im/err/err-1.7.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils user
+
+DESCRIPTION="Plugin based chatbot designed to be easily deployable, extensible and maintainable"
+HOMEPAGE="https://errbot.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +plugins"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyfire[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	dev-python/xmpppy[${PYTHON_USEDEP}]
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+	plugins? ( dev-vcs/git )"
+
+# Testsuite is broken since 1.6.3
+RESTRICT="test"
+
+# NOTES:
+# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
+# 2. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 3. Internal web server is broken(dunno why :-()
+
+pkg_setup() {
+	ebegin "Creating err group and user"
+	enewgroup 'err'
+	enewuser 'err' -1 -1 -1 'err'
+	eend ${?}
+}
+
+python_prepare_all() {
+	# Remove configparser and config from requirements as they are NOT needed
+	sed -i \
+		-e "/install_requires/s/'configparser', //" \
+		-e "/install_requires/s/, 'config'//" \
+		setup.py || die
+
+	# Tests are broken and should not be installed
+	rm -r tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	keepdir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6ac35e7a52d2..fbcd95685351 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/curl/curl-7.61.0.ebuild b/net-misc/curl/curl-7.61.0.ebuild
index 1b6eae2e8855..bdb16f44ced6 100644
--- a/net-misc/curl/curl-7.61.0.ebuild
+++ b/net-misc/curl/curl-7.61.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
index b0bf8d76cd11..705031598053 100644
--- a/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
 	>=net-misc/gns3-converter-1.3.0[${PYTHON_USEDEP}]
-	=net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-qt/qtgui:5
 	dev-qt/qtsvg:5
 	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
index 4e2020676ee9..a8118d51b05d 100644
--- a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
-	=net-misc/gns3-server-$PVR[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
index e8b9a99df0c5..f9cc17a23bd1 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
-	~net-misc/gns3-server-$PV[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
new file mode 100644
index 000000000000..99b32df27ad8
--- /dev/null
+++ b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
@@ -0,0 +1,9 @@
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -6,5 +6,5 @@
+ raven>=5.23.0
+ psutil>=3.0.0
+ zipstream>=1.1.4
+-typing>=3.5.3.0 # Otherwise yarl fails with python 3.4
++typing>=3.5.3.0;python_version<"3.5" # Otherwise yarl fails with python 3.4
+ prompt-toolkit
diff --git a/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild b/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild
new file mode 100644
index 000000000000..8bcb6c9c3b05
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+		>=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/aiohttp-cors-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+		>=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+		>=dev-python/yarl-0.7.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	ewarn ""
+	ewarn "The following is a list of packages that can be added:"
+	ewarn "app-emulation/qemu, app-emulation/virtualbox"
+	ewarn "app-emulation/docker and net-analyzer/wireshark"
+	ewarn ""
+	ewarn "The following packages are currently unsupported:"
+	ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild b/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
deleted file mode 100644
index 624d2a1d1232..000000000000
--- a/net-misc/gns3-server/gns3-server-1.5.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
-		>=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/aiohttp-cors-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-		>=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-		>=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-0.7.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	ewarn ""
-	ewarn "The following is a list of packages that can be added:"
-	ewarn "app-emulation/qemu, app-emulation/virtualbox"
-	ewarn "app-emulation/docker and net-analyzer/wireshark"
-	ewarn ""
-	ewarn "The following packages are currently unsupported:"
-	ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
deleted file mode 100644
index 667fc7a119c9..000000000000
--- a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
-		=dev-python/aiohttp-1.3.5*[${PYTHON_USEDEP}]
-		=dev-python/aiohttp-cors-0.5.1[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-		>=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
-		~dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -rf tests || die
-	eapply_user
-}
-
-pkg_postinst() {
-	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	ewarn ""
-	ewarn "The following is a list of packages that can be added:"
-	ewarn "app-emulation/qemu, app-emulation/virtualbox"
-	ewarn "app-emulation/docker and net-analyzer/wireshark"
-	ewarn ""
-	ewarn "The following packages are currently unsupported:"
-	ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..4dfbfec240f4
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+		=dev-python/aiohttp-1.3.5*[${PYTHON_USEDEP}]
+		=dev-python/aiohttp-cors-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+		~dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	rm -rf tests || die
+	eapply_user
+}
+
+pkg_postinst() {
+	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	ewarn ""
+	ewarn "The following is a list of packages that can be added:"
+	ewarn "app-emulation/qemu, app-emulation/virtualbox"
+	ewarn "app-emulation/docker and net-analyzer/wireshark"
+	ewarn ""
+	ewarn "The following packages are currently unsupported:"
+	ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
deleted file mode 100644
index c5055f961770..000000000000
--- a/net-misc/gns3-server/gns3-server-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
-		>=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
-		>=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
-		dev-python/prompt_toolkit[${PYTHON_USEDEP}]
-		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-		>=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-0.11[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Package installs 'tests' package which is forbidden
-	rm -rf tests || die
-}
-
-pkg_postinst() {
-	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	ewarn ""
-	ewarn "The following is a list of packages that can be added:"
-	ewarn "app-emulation/qemu, app-emulation/virtualbox"
-	ewarn "app-emulation/docker and net-analyzer/wireshark"
-	ewarn ""
-	ewarn "The following packages are currently unsupported:"
-	ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..282ff6a38407
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="http://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emulation/dynamips-0.2.12
+		>=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
+		>=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
+		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+		dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+		>=dev-python/yarl-0.11[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://github.com/GNS3/gns3-server/pull/1368
+PATCHES=( "${FILESDIR}/${P}-typing.patch" )
+
+src_prepare() {
+	default
+
+	# Package installs 'tests' package which is forbidden
+	rm -rf tests || die
+}
+
+pkg_postinst() {
+	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	ewarn ""
+	ewarn "The following is a list of packages that can be added:"
+	ewarn "app-emulation/qemu, app-emulation/virtualbox"
+	ewarn "app-emulation/docker and net-analyzer/wireshark"
+	ewarn ""
+	ewarn "The following packages are currently unsupported:"
+	ewarn "iouyap and vpcs"
+}
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 7012b6c468af..1ff1650e8848 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -4,5 +4,7 @@
 <!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
+		<remote-id type="github">GNS3/gns3-server</remote-id>
+		<bugs-to>https://github.com/GNS3/gns3-server/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index e6deb7fcf2dc..0e76b65abf30 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,2 +1,2 @@
 DIST kea-1.3.0.tar.gz 5996560 BLAKE2B 2037aed1d72c8db58f6be88caa695956e482776571879f439d39dad909c1f79e4fa4353fef1eacf1135e763109f777a8a30500892a9ee1d8d261d3fd41f6257c SHA512 4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b
-DIST kea-1.4.0.tar.gz 6552970 BLAKE2B bb12a19b156f58f5146904214dc2b0812a56827e7e72d6336db07e64b49bcc198ccc26245088dfccb268b058db574fc43e036341eadc3b1677a03816f6385990 SHA512 ce4e2bcdc6f06472c4dccfc9cc26b06ff10ce1ce947b2bdc8753bbb15ff77831f7317625bdd81d24c945cf0d4c33cf9eef0ae0be21149532b0b9b9bc8892dd14
+DIST kea-1.4.0-P1.tar.gz 6645111 BLAKE2B 290b7bcf8b32fcf2762240f2173cb45c035187c7dfd1affd0fd8a947721745ea9d8846be365ee3f9331d578b7bc248ee53a1e37666585a62c90d7dc541c7aaa5 SHA512 beb3baae09510de970fb5c1a301c57d64fc56d825d964f413357ba448b993d0a4f714d4efa4da166d3c06623a9ae78b70c25b61793e696551cb97b7e08d5e634
diff --git a/net-misc/kea/kea-1.4.0.ebuild b/net-misc/kea/kea-1.4.0_p1.ebuild
similarity index 100%
rename from net-misc/kea/kea-1.4.0.ebuild
rename to net-misc/kea/kea-1.4.0_p1.ebuild
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index b3312db88dd3..3968b59aff2f 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999* ]] && eautoreconf
+	[[ ${PV} = *9999 ]] && eautoreconf
 	# Brand the version with Gentoo
 	sed -i \
 		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 627932e47051..1cae65ec106e 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 4d9c46824777..78d8711607d9 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,4 @@
 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
 DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
-DIST cups-filters-1.20.2.tar.xz 1468792 BLAKE2B 75153e659aebf3b987bddac60c850a8b21038263bdb2a77772fa2d41295b36b6c35d9244e09efe19e29e19e7a6f1af5adb7be26197890d8a1e642e39b013ee28 SHA512 94cc2a452b8dc1ed5f03b98e0530d7489dd5a369413b0ab0e7b054fcb198e8fee283507de2ef836df8ce9fb7f217794737fa4851baba72e5b79e38ad02ee61ea
 DIST cups-filters-1.20.3.tar.xz 1469468 BLAKE2B 4b76c751264cc87aaa4fed237ad577433ca2c5bb9f23d572466f0d81f3cd7ee4c78eb783269923603010f4edbf246353017e57ccdc75207855de9ae5f0fc5d4b SHA512 402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31
+DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
diff --git a/net-print/cups-filters/cups-filters-1.20.2.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
similarity index 100%
rename from net-print/cups-filters/cups-filters-1.20.2.ebuild
rename to net-print/cups-filters/cups-filters-1.20.4.ebuild
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index bfed0b638e91..be4ec7dfe0fa 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 51ecd6d033cb..c359fd041deb 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 3771883bed3f..749db6411df9 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,5 +1,5 @@
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
-DIST unifi-5.7.28.zip 79362245 BLAKE2B 5edb7b92d602ba780b0fa7613360ada39f09b347b247945761af80d0180d4653b19cb5cd1d7bd11332a85de8481c4981b111e572cb755a83b676362494a5505c SHA512 f6ba667a2f0b5959ed715a190fdbdfe308ea256c2d485f96d43fe797912dfe6992cbaed95add5899293fabdd371c1814572bf1189a4ce93c632743dca40b87e3
-DIST unifi-5.8.23.zip 80086708 BLAKE2B ea7aec61d74132a47843084f1987e6e016c4fb1ec96d077dac2a9b122003274b0314927404468669a5d7cc0bdb6a307c97bca09f663b180d15bf18436b35408b SHA512 2b42df2a84574ac9e282c7ff59eb86ce29170ea7ef5957690dec8772c90acda3c08c633b3bceeac08bb73ff1460143207a64d2405de19436faf20a042849231b
 DIST unifi-5.8.24.zip 80086706 BLAKE2B 00530b5e141e9444120efeb6ea5b3106781fb5b15a1ade44b71675a726ae7245221af694b36a922a4d047f78567a7bd9e1354d6dde442dfccd58a49f87079403 SHA512 cf7145eeeed779893c1c9709eef7364154503dd1232f88cce38facc748426d19c5422decbd5e3a80d857a2d82969258045944b491c7b228467d8e4a7c29a0ec1
+DIST unifi-5.8.25.zip 80091828 BLAKE2B f675ff304c2e7a87da7ed02bd4873015a1155949e6b3b2b4561db06565197e1660512cbea118a50bd975de7d6268a090fad6742e3a82bb4fdf20f19f39099ae2 SHA512 4572ebe55971d14ca76f39cf298eedf879c4ad597ac87e4fe13167f8219b8f822f3478002ccda7ca1d72daba05efa52932e6d163c1e2b5ac5d289020e351044f
+DIST unifi-5.9.12.zip 103000745 BLAKE2B 30613f8ee9bf832f5303d02cc2719cb91358a558afe4f998541b890be6c152a62171ad1711e78fd0f2e011161d03cdb9afa9c8dffc3b553b9c7b637f61f12b10 SHA512 0f8c549dfc390d71e3f8a58c05647b3cd062a55de248128267dda3c079f744a810a0138016616d5be6b2e05ecd34149172efd369c1cf4c1e24735ba982c266cb
 DIST unifi-5.9.4.zip 102808708 BLAKE2B 3b1479bd65837667f2abff594426ecc3491475d1cf6d842d07cdc8868cabf59facc857263fcfb1ef30fdb8dbb4c0a037b7e04736b8debf0f4f795494fc62ee26 SHA512 01e2d8c2d48a552e3b5d03cb97b0241e0561a4c88e52f13ec2d2a8a8b7d75ba7d9eb7878e37876efe5581e439afaac359ae6e3e7b2bb3d0719ebdbb10b06778c
diff --git a/net-wireless/unifi/files/unifi.initd b/net-wireless/unifi/files/unifi.initd
deleted file mode 100644
index 48fd9dd3b4a4..000000000000
--- a/net-wireless/unifi/files/unifi.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ACE_LIB="lib/ace.jar"
-DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java
-JAVA_OPTS="-Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp"
-UNIFI_GROUP="unifi"
-UNIFI_PATH="/usr/lib/unifi"
-UNIFI_USER="unifi"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting UniFi Controller"
-	start-stop-daemon --start --quiet --background --user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping UniFi Controller"
-	start-stop-daemon --start --quiet --background --user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} stop
-	eend $?
-}
diff --git a/net-wireless/unifi/unifi-5.6.39.ebuild b/net-wireless/unifi/unifi-5.6.39.ebuild
deleted file mode 100644
index aeda8f7c164b..000000000000
--- a/net-wireless/unifi/unifi-5.6.39.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.6"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/armhf lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.7.28-r1.ebuild b/net-wireless/unifi/unifi-5.7.28-r1.ebuild
deleted file mode 100644
index c164485244d9..000000000000
--- a/net-wireless/unifi/unifi-5.7.28-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-5c442c6b54"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.7"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.7.28.ebuild b/net-wireless/unifi/unifi-5.7.28.ebuild
deleted file mode 100644
index bc8c89abc804..000000000000
--- a/net-wireless/unifi/unifi-5.7.28.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-5c442c6b54"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.7"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.23-r1.ebuild b/net-wireless/unifi/unifi-5.8.23-r1.ebuild
deleted file mode 100644
index 0bf53df426d5..000000000000
--- a/net-wireless/unifi/unifi-5.8.23-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-d5a5bbfda4"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.23.ebuild b/net-wireless/unifi/unifi-5.8.23.ebuild
deleted file mode 100644
index 265ecf2d858d..000000000000
--- a/net-wireless/unifi/unifi-5.8.23.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-d5a5bbfda4"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.24.ebuild b/net-wireless/unifi/unifi-5.8.24.ebuild
deleted file mode 100644
index 307f0db8a4f1..000000000000
--- a/net-wireless/unifi/unifi-5.8.24.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.25.ebuild b/net-wireless/unifi/unifi-5.8.25.ebuild
new file mode 100644
index 000000000000..5e504bcbf6c9
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.8.25.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-34502471b9"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.8"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.9.12.ebuild b/net-wireless/unifi/unifi-5.9.12.ebuild
new file mode 100644
index 000000000000..ad64b5df30fe
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.9.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-ZD3vz8Yw57I"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.9"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.9.4.ebuild b/net-wireless/unifi/unifi-5.9.4.ebuild
deleted file mode 100644
index 9ca7b2b27c36..000000000000
--- a/net-wireless/unifi/unifi-5.9.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-b647df56b7"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.9"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e646846a8f3b..1466adcd4339 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 144142b62ad7..7c318aca470c 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Patrick McLean <chutzpah@gentoo.org> (12 Jul 2018)
+# requires nodejs
+>=sys-cluster/ceph-13
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Broken multilib dependencies.
 net-im/mattermost-desktop-bin
diff --git a/profiles/package.mask b/profiles/package.mask
index e44e059b70df..b38fe7e62b5c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Corentin Pazdera <nado@troglodyte.be> (12 Jul 2018)
+# Pulseeffects depends on atoms only found in gnome overlay
+=media-sound/pulseeffects-9999
+=media-sound/pulseeffects-4.1.3
+
+# Michał Górny <mgorny@gentoo.org> (12 Jul 2018)
+# Abandoned upstream, no reverse dependencies.  Collides with
+# dev-python/promises (that has revdeps).
+# Removal in 30 days.  Bug #651156.
+dev-python/promise
+
 # Jonas Stein <jstein@gentoo.org> (10 Jul 2018)
 # Package is not maintained, has a broken SRC_URI and 
 # we may not mirror the files.
@@ -280,10 +291,6 @@ games-strategy/gorky17-demo
 # a month
 net-vpn/miredo
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to build (#642996). Removal in a month.
-games-engines/gargoyle
-
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # Fails to compile (#648430), crashes from time to time (#222065). Removal
 # in a month.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 151757668419..2b769d8df7c5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2050,6 +2050,7 @@ dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the
 dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator
 dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
 dev-lang/rust-bin:cargo - Install cargo component
+dev-lang/rust-bin:rustfmt - Install rustfmt component
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -3230,6 +3231,7 @@ games-emulation/dolphin:lto - Add support for link-time optimizations.
 games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/openglide
 games-emulation/fceux:logo - Enable the ability to add a logo screen when creating AVIs
 games-emulation/generator:sdlaudio - Enable SDL Audio
+games-emulation/hatari:sdl2 - Use libsdl2 instead of libsdl
 games-emulation/higan:icarus - Build icarus library manager
 games-emulation/higan:udev - Enable udev based input
 games-emulation/m64py:7z - Ensure support for .7z archives.
@@ -3599,7 +3601,6 @@ kde-apps/kopete:translator - Translate incoming and outgoing messages.
 kde-apps/kopete:urlpicpreview - Enables in conversation pictures preview.
 kde-apps/kopete:webpresence - Show your status and some more information on web.
 kde-apps/kopete:winpopup - Enable pop-up messages sending on windows. (same as good old "net send" messages ;])
-kde-apps/kopete:yahoo - Enable yahoo protocol support.
 kde-apps/kopete:zeroconf - Enable Link-Local Messaging via the bonjour protocol.
 kde-apps/kpimtextedit:designer - Build plugins for dev-qt/designer
 kde-apps/kpimtextedit:speech - Enable text-to-speech support
@@ -4787,6 +4788,10 @@ media-sound/pulseaudio:ssl - Use dev-libs/openssl to provide support for RAOP (A
 media-sound/pulseaudio:system-wide - Allow preparation and installation of the system-wide init script for PulseAudio. Since this support is only supported for embedded situations, do not enable without reading the upstream instructions at https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
 media-sound/pulseaudio:systemd - Build with sys-apps/systemd support to replace standalone ConsoleKit.
 media-sound/pulseaudio:webrtc-aec - Uses the webrtc.org AudioProcessing library for enhancing VoIP calls greatly in applications that support it by performing acoustic echo cancellation, analog gain control, noise suppression and other processing.
+media-sound/pulseeffects:bs2b - Enable use of media-libs/libbs2b
+media-sound/pulseeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/pulseeffects:mda-lv2 - Enable use of media-plugins/mda-lv2 for the loudness FX
+media-sound/pulseeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
 media-sound/qmidiarp:lv2 - Enables Ladspa V2 plugins.
 media-sound/qmmp:analyzer - Enable visual analyzer
 media-sound/qmmp:archive - Enable archiving plugin via app-arch/libarchive.
@@ -5151,12 +5156,15 @@ media-video/mpv:sdl - Enable media-libs/libsdl2 based video and audio outputs (N
 media-video/mpv:tools - Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv
 media-video/mpv:uchardet - Enable subtitles charset discovery via app-i18n/uchardet
 media-video/mpv:vulkan - Enable support for various Vulkan-based video backends
-media-video/noad:libmpeg2 - Support for libmpeg2 library
+media-video/noad:libmpeg2 - Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg
 media-video/nvidia-settings:gtk3 - Additionally build the GTK 3 library
 media-video/nvidia_video_sdk:tools - Build and install example tools.
 media-video/obs-studio:fdk - Enable libfdk support for AAC encoding.
 media-video/obs-studio:imagemagick - Use ImageMagick for image loading instead of FFmpeg.
-media-video/obs-studio:nvenc - Enable NVENC encoding for nVidia video cards
+media-video/obs-studio:luajit - Build support for scripting via Luajit.
+media-video/obs-studio:nvenc - Enable NVENC encoding for nVidia video cards.
+media-video/obs-studio:python - Build support for scripting via Python 3.
+media-video/obs-studio:speexdsp - Enable noise suppression filter support via media-libs/speexdsp.
 media-video/ogmrip:ogm - Support for OGM container format
 media-video/ogmrip:srt - Support for SRT subtitle format
 media-video/orion:mpv - Use the media-video/mpv player (upstream default) instead of the dev-qt/qtmultimedia one
@@ -7331,6 +7339,7 @@ sci-libs/coinor-utils:glpk - Enable GNU Linear Programming Kit sci-mathematics/g
 sci-libs/dlib:cblas - Build with CBLAS virtual/cblas
 sci-libs/dlib:cuda - Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)
 sci-libs/dlib:mkl - Enable support for Intel FFT sci-libs/mkl
+sci-libs/dlib:python - Enable support for Python API bindings
 sci-libs/dmlc-core:s3 - Support for the Amazon Simple Storage Service
 sci-libs/fftw:float - Link default library to single precision instead of double (symlinks only and fftw-2.1)
 sci-libs/fftw:quad - Build quadruple precision lib
@@ -7718,6 +7727,7 @@ sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
 sys-apps/fwupd:pkcs7 - Enable PKCS7 verification support via net-libs/gnutls.
+sys-apps/fwupd:redfish - Install redfish plugin
 sys-apps/fwupd:uefi - Enable UEFI support
 sys-apps/fwupd:uefi_labels - Enable UEFI labels support
 sys-apps/gawk:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
@@ -8515,6 +8525,7 @@ www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
 www-apps/gitit:network-uri - Get Network.URI from the network-uri package.
 www-apps/gitit:plugins - enables optional plugin runtime loader
 www-apps/guacamole:noauth - enable support for leaving out any authentication on the webinterface
+www-apps/hugo:sass - Enable SASS/SCSS support
 www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
 www-apps/klaus:ctags - Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions
@@ -8528,6 +8539,21 @@ www-apps/nikola:watchdog - Use dev-python/watchdog to monitor file system events
 www-apps/nikola:webmedia - Use dev-python/micawber to extract metadata from web media links
 www-apps/nikola:websocket - Add websocket support thru dev-python/ws4py
 www-apps/otrs:mod_perl - Provide all dependencies for use of mod_perl instead of cgi
+www-apps/phpsysinfo:apcupsd - Install sys-power/apcupsd to display those stats.
+www-apps/phpsysinfo:dmraid - Install sys-fs/dmraid to display those stats.
+www-apps/phpsysinfo:freeipmi - Install sys-libs/freeipmi to display those stats.
+www-apps/phpsysinfo:hddtemp - Install app-admin/hddtemp to display those stats.
+www-apps/phpsysinfo:ipmitool - Install sys-apps/ipmitool to display those stats.
+www-apps/phpsysinfo:ipmiutil - Install sys-apps/ipmiutil to display those stats.
+www-apps/phpsysinfo:iptables - Install net-firewall/iptables to display those stats.
+www-apps/phpsysinfo:lm_sensors - Install sys-apps/lm_sensors to display those stats.
+www-apps/phpsysinfo:mdadm - Install sys-fs/mdadm to display those stats.
+www-apps/phpsysinfo:megactl - Install sys-block/megactl to display those stats.
+www-apps/phpsysinfo:nut - Install sys-power/nut to display those stats.
+www-apps/phpsysinfo:quota - Install sys-fs/quota to display those stats.
+www-apps/phpsysinfo:smart - Install sys-apps/smartmontools to display those stats.
+www-apps/phpsysinfo:snmp - Install net-analyzer/net-snmp to display those stats.
+www-apps/phpsysinfo:uptime - Install app-misc/uptimed to display those stats.
 www-apps/postfixadmin:vacation - Install vacation.pl script and dependencies
 www-apps/radicale:bcrypt - Depend on passlib to enable bcrypt and md5 authentication methods
 www-apps/redmine:markdown - Enable support for Markdown
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4b9e833ffc57..3ed75776d302 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 326d98722fb2..e29ea272a5f2 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,2 +1,3 @@
 DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
 DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
+DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
new file mode 100644
index 000000000000..82d750cd9a8c
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-r1 cmake-utils cuda
+
+DESCRIPTION="Numerical and networking C++ library"
+HOMEPAGE="http://dlib.net/"
+SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+	cblas? ( virtual/cblas:= )
+	cuda? ( dev-libs/cudnn:= )
+	jpeg? ( virtual/jpeg:0= )
+	lapack? ( virtual/lapack:= )
+	mkl? ( sci-libs/mkl:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3= )
+	X? ( x11-libs/libX11:= )
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake-utils_src_prepare
+	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-DDLIB_ENABLE_ASSERTS="$(usex debug)"
+		-DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
+		-DDLIB_GIF_SUPPORT="$(usex gif)"
+		-DDLIB_JPEG_SUPPORT="$(usex jpeg)"
+		-DDLIB_PNG_SUPPORT="$(usex png)"
+		-DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
+		-DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
+		-DDLIB_USE_BLAS="$(usex cblas)"
+		-DDLIB_USE_CUDA="$(usex cuda)"
+		-DDLIB_USE_LAPACK="$(usex lapack)"
+		-DBOOST_LIBRARYDIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	mkdir "${BUILD_DIR}"/dlib/test || die
+	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+	cmake "${S}"/dlib/test && emake
+	./dtest --runall || die
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		python_foreach_impl python_domodule ${PN}
+	fi
+	dodoc docs/README.txt
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 422f29c52e5a..97d198eb46be 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag>
     <flag name="cuda">Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)</flag>
     <flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag>
+    <flag name="python">Enable support for Python API bindings</flag>
   </use>
   <upstream>
     <remote-id type="github">davisking/dlib</remote-id>
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index af4c1c9d87ea..070d28f60026 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -19,6 +19,7 @@ DIST cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz 1796107 BLAKE2B 65cd
 DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43
 DIST eigen-6913f0cf7d06.tar.gz 2296773 BLAKE2B f3d4ed1577abc7f722fb600e79bcb1294ae5d6a4499668df05a8b9014bfafb576e6d15d3e311080e6e6ed3afd00e60ccd0c1092161a218d200a32668bef83ea2 SHA512 e1cbd55edfc128ee5c2d0bc08a7fec051efb5713f78e2d323ce49074bf1b86d63e7fcc06c01e469c01d2476dd369e4159ecb306f6d28371a3274402d0ea25e87
 DIST eigen-e5e305a158a0.tar.gz 2312776 BLAKE2B 268419895e1c49963bd15b6e9142775d782f8d7e6aa88f55eaa7b5dd42ce11456c8687235ff2478bedaf232b7df71832fdbaed62026f7880501c0403cfcf6d4d SHA512 f6070e2cec18c059f296857405c90e06566f643a4e3499a6eceaab8682597c192f8b9b91bdbbfa53aa654969a2269cda6a1c044b92e4a9f8362e8831e773daf8
+DIST eigen-fd6845384b86.tar.gz 2312810 BLAKE2B aae02b053e9b22b0c063d1173b28fd7d71cdec6b6e6702624b8fdeb707ada24e5415079f1a1c7b8fe108c7e632c6c736e13cfbdc101270742565b7045a57616a SHA512 b999e60236abf7a6a5062aa55b0aeefe9254b204416092649d4a88d42fef7c571e3ba563bbbf94033093f789511793d614c1ce94a0a0f3eb4b18df466b6345a5
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST fft.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz 613854 BLAKE2B 982142b7dd81791f221d7f3cbbecf6539549c86c436e0cf3ae0c57bd7535b90083c7d2709abc811abcf3b6fee417a16b1d8dcdedcce58fd8715db7ae785a7bff SHA512 01ffc047483edaaccc13bf256d59eef0c4cb7488618f1e908c74e0dcc599f00856d052d209a079d35e385bef973a4c6daf401107c4be85bba46dcc3b4f453b26
@@ -63,8 +64,10 @@ DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f
 DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a SHA512 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
 DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
 DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
+DIST tensorflow-1.9.0.tar.gz 23571524 BLAKE2B 2961ef5a35d3271512999478f6e260c90c48537e251b41d60ae9e033386c0dd9e1337af85c5441afca1b8cf5b3726349ba0e56cccdfa95fdf1c5e9e4d4db8af5 SHA512 eb25dafccf2ec600c4ca28612362c8317b8b9160610ca9fb60f265815651c155b19ae5be3f213a0d9e716d9e25637d6502164433955247cf6fa5d75408b7ac84
 DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
 DIST tensorflow-1.9.0_rc2.tar.gz 24167723 BLAKE2B b676c8d521a060487fb5d31b75beda2e7c301396ceaa887776e368a16541ed0be0ad85c92901a45d8df324a857a324b706a6d0f38c91a2d991dcd7c40d3ecb3a SHA512 e8544b56a040b0b1a65c92455e002ea33e65d1fcd5f7eb94b4abcae74e0d8aa6982624c0133e9bdda6e57f52f410861977e866112fc1fc28ba9b4c836836a11a
+DIST tensorflow-patches-1.9.0.tar.bz2 8588 BLAKE2B 7fbdaa680b3bc372c760861709776cf333d587398297fb596332bb7394a7747c86cdc87615ae6f74e81d4e6b39a34aa3a9b6ee7cab95237316f20a315773b12b SHA512 35d56a1e71e500f41e423a2b58d58d210737afd2d9cd955aed227036a066506be1b39e7809f71d82c80f055ed43dfe1813213975acfb8d86be38baf24510e0f3
 DIST tensorflow-patches-1.9.0_rc1-r2.tar.bz2 9372 BLAKE2B fe6d33deff5cdf1158319f2e30c7c79130c555d8d8c5f8fa719c7760e1edcc1083118fcff04c0e8aedd089dd95641e19240d14d6d10e28d2dd6ae9f4ec75f185 SHA512 fc904e2396e4a0e98baa463d1bdfc421402a5e17609fe7d4ec30f6c3e5692a432f5db36ba7fa9083e9eebf4dba29b48865102fb24429bde072c738c76478d377
 DIST tensorflow-patches-1.9.0_rc2.tar.bz2 8038 BLAKE2B b416abcd1aaf3fa221eecd8e5e13bece47e13b42666c754388acf93fef4ca9f1e6a178027053402dfcabc8c9b220867fe63a73d97f56b62ec51def537d2706c4 SHA512 e6d7e8771bb9f27e5c5099b6d33f7f44bc4a2e40df1e3996e1fd7473eb836f33348c31931a28ab5d46771219b90b2eebc57d78471ee77d0ccb49fb437cd96a07
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
new file mode 100644
index 000000000000..824e9cc079ef
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
@@ -0,0 +1,425 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda jemalloc mpi +python system-libs"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/fd6845384b86.tar.gz -> eigen-fd6845384b86.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
+	https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
+	https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
+	https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz
+	cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz )
+	python? (
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+		https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
+		https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz
+		https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz
+		https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
+		https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
+		https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/53f822805e77ea7715f5b52c592a162c515c7219.tar.gz -> google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz
+		https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
+		https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz
+		https://github.com/llvm-mirror/llvm/archive/fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz -> llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz
+		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
+		https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+		!system-libs? (
+			http://ftp.exim.org/pub/pcre/pcre-8.42.tar.gz
+			http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
+			https://curl.haxx.se/download/curl-7.60.0.tar.gz
+			https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
+			https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
+			https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+			https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz -> flatbuffers-v1.9.0.tar.gz
+			https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
+		)
+	)
+	!system-libs? (
+		http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
+		http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
+		https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz
+		https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
+		https://github.com/google/re2/archive/2018-04-01.tar.gz -> re2-2018-04-01.tar.gz
+		https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
+		https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
+		https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
+		https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
+		https://zlib.net/zlib-1.2.11.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
+	mpi? ( virtual/mpi )
+	system-libs? (
+		app-arch/snappy
+		dev-db/lmdb
+		dev-db/sqlite
+		>=dev-libs/flatbuffers-1.8.0
+		>=dev-libs/jsoncpp-1.8.4
+		dev-libs/libpcre
+		>=dev-libs/protobuf-3.6.0
+		>=dev-libs/re2-0.2018.04.01
+		media-libs/giflib
+		media-libs/libjpeg-turbo
+		media-libs/libpng:0
+		>=net-libs/grpc-1.12.1[${PYTHON_USEDEP}]
+		net-misc/curl
+		sys-libs/zlib
+		jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+		python? (
+			${PYTHON_DEPS}
+			dev-python/absl-py[${PYTHON_USEDEP}]
+			dev-python/astor[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/termcolor[${PYTHON_USEDEP}]
+			virtual/python-enum34[${PYTHON_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}
+	!python? ( dev-lang/python )
+	app-arch/unzip
+	>=dev-util/bazel-0.14.0
+	dev-java/java-config
+	dev-python/mock
+	system-libs? (
+		dev-lang/nasm
+		dev-lang/swig
+		dev-python/cython
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+bazel-get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+setup_bazelrc() {
+	if [[ -f "${T}/bazelrc" ]]; then
+		return
+	fi
+
+	# F: fopen_wr
+	# P: /proc/self/setgroups
+	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
+	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
+	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
+	addpredict /proc
+
+	mkdir -p "${T}/bazel-cache" || die
+	mkdir -p "${T}/bazel-distdir" || die
+
+	cat > "${T}/bazelrc" <<-EOF
+	startup --batch
+
+	# dont strip HOME, portage sets a temp per-package dir
+	build --action_env HOME
+
+	# make bazel respect MAKEOPTS
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+	build --compilation_mode=opt --host_compilation_mode=opt
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --strip=never
+	build --verbose_failures --noshow_loading_progress
+	test --verbose_test_summary --verbose_failures --noshow_loading_progress
+
+	# make bazel only fetch distfiles from the cache
+	fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+	build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+	EOF
+}
+
+ebazel() {
+	setup_bazelrc
+
+	# Use different build folders for each multibuild variant.
+	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+	local output_base="${WORKDIR}/bazel-base${base_suffix}"
+	mkdir -p "${output_base}" || die
+
+	einfo Running: bazel --output_base="${output_base}" "$@"
+	bazel --output_base="${output_base}" $@ || die
+}
+
+load_distfiles() {
+	# Populate the bazel distdir to fetch from since it cannot use the network
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
+	local src dst uri rename
+
+	while read uri rename dst; do
+		src="${uri##*/}"
+		[[ -z $src ]] && continue
+		if [[ "$rename" != "->" ]]; then
+			dst="${src}"
+		fi
+
+		[[ ${A} =~ ${dst} ]] || continue
+
+		if [[ "$dst" == "$src" ]]; then
+			einfo "Copying $dst to bazel distdir $src ..."
+		else
+			einfo "Copying $dst to bazel distdir ..."
+		fi
+		cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	setup_bazelrc
+	load_distfiles
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	if use cuda; then
+		for i in /dev/nvidia*; do
+			addpredict $i
+		done
+	fi
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+		export TF_NEED_GCP=0
+		export TF_NEED_HDFS=0
+		export TF_NEED_S3=0
+		export TF_NEED_AWS=0
+		export TF_NEED_KAFKA=0
+		export TF_ENABLE_XLA=0
+		export TF_NEED_GDR=0
+		export TF_NEED_VERBS=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_MKL=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+
+			TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
+			TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
+			export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+
+			TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
+			TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
+			export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		# Only one bazelrc is read, import our one before configure sets its options
+		echo "import ${T}/bazelrc" >> ./.bazelrc
+
+		# This is not autoconf
+		./configure || die
+
+		sed -i '/strip=always/d' .tf_configure.bazelrc || die
+
+		if use system-libs; then
+			echo 'build --action_env TF_SYSTEM_LIBS="astor_archive,com_googlesource_code_re2,curl,cython,flatbuffers,gif_archive,grpc,jemalloc,jpeg,lmdb,nasm,org_sqlite,pcre,png_archive,six_archive,snappy,swig,termcolor_archive,zlib_archive"' >> .tf_configure.bazelrc || die
+		fi
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# Symlink to the main .so file
+		python_export PYTHON_SITEDIR
+		rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+		dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
+
+		# Symlink to python-exec scripts
+		for i in "${D}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
+		done
+
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	einfo "Installing headers"
+	# Install c c++ and core header files
+	for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
+		insinto /usr/include/${PN}/${i%/*}
+		doins ${i}
+	done
+
+	einfo "Installing generated headers"
+	for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+		j=${i#bazel-genfiles/}
+		insinto /usr/include/${PN}/${j%/*}
+		doins ${i}
+	done
+
+	einfo "Installing Eigen headers"
+	ebazel build //third_party/eigen3:install_eigen_headers
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/third_party/eigen3/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
+	dolib.so bazel-bin/tensorflow/lib${PN}.so
+	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
+
+	einstalldocs
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9ed682f3268c..7c4ec3675d15 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index 4721b1832852..b32475f03a75 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
 )
 
 src_prepare() {
+	sed -e 's#CPPFLAGS="-I/usr/include/mysql#CPPFLAGS="-I'"${EPREFIX}"'/usr/include/mysql#' -i configure.ac || die
 	use odbc && [[ -z $(type -P odbc_config) ]] && \
 		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
 
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index dfdecc5d6241..e6505ed60c75 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1 +1,2 @@
 DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 BLAKE2B d9eb7201dfd5962c88ac8995e3cd800bf318f575a5e6ff7d0219941c0f0c9052e6b2c95c7c16fcd81b90cac647d503041bf16560bd44b58e7e0ced1ef2314bd2 SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1
+DIST why3-for-spark-gpl-2018-src.tar.gz 7682767 BLAKE2B 0b0272ca4d5519ca402990b234d0847378bcd2a0949fea78ea10e355233a16aebe79b938cdf8e4daadabb909171cab83b9d6ccacf9f2dc1c0b57bb6da6fd1fe0 SHA512 fc798acf343484fd8e70f470a318753c9a0e9967ff579f20ec185bf3c2a75e7a4a556388fc86a378610ce4a467f3e722c6f610da34d4c33bc3d6b10551731f07
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch
new file mode 100644
index 000000000000..9d7165cbed78
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2018-gentoo.patch
@@ -0,0 +1,25 @@
+--- why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml.old	2017-10-18 09:07:03.118919785 +0200
++++ why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml	2017-10-18 09:07:45.198216939 +0200
+@@ -12,10 +12,7 @@
+   | Limit_Check of Gnat_expl.check
+   | Limit_Line of Gnat_loc.loc
+ 
+-let spark_prefix =
+-  (Filename.dirname
+-          (Filename.dirname (Filename.dirname
+-          (Filename.dirname Sys.executable_name))))
++let spark_prefix = "/usr"
+ 
+ let rec file_concat l =
+   match l with
+--- why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4.old	2017-10-26 22:25:55.289094778 +0200
++++ why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4	2017-10-26 22:26:10.719807270 +0200
+@@ -1352,7 +1352,7 @@
+     let limit =
+     { Call_provers.empty_limit with Call_provers.limit_time = timelimit } in
+     let call = Driver.prove_task ~command ~limit drv !task in
+-    wait_on_call call
++    wait_on_call (ServerCall call)
+   with
+     | NotFO ->
+         if debug then Printexc.print_backtrace stderr; flush stderr;
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
new file mode 100644
index 000000000000..e766cce4ade3
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2018.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="Platform for deductive program verification"
+HOMEPAGE="http://why3.lri.fr/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a43
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
+RESTRICT=strip
+
+DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
+	dev-ml/menhir
+	coq? ( sci-mathematics/coq )
+	doc? ( dev-tex/rubber )
+	gtk? ( dev-ml/lablgtk[sourceview] )
+	emacs? ( app-editors/emacs:* )
+	html? ( dev-tex/hevea )
+	hypothesis-selection? ( dev-ml/ocamlgraph )
+	zarith? ( dev-ml/zarith )
+	zip? ( >=dev-ml/camlzip-1.07 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+REQUIRED_USE="html? ( doc )"
+
+src_configure() {
+	econf \
+		--disable-pvs-libs \
+		--disable-isabelle-libs \
+		$(use_enable coq coq-libs) \
+		$(use_enable coq coq-tactic) \
+		$(use_enable doc) \
+		$(use_enable emacs emacs-compilation) \
+		$(use_enable gtk ide) \
+		$(use_enable html html-doc) \
+		$(use_enable hypothesis-selection) \
+		$(use_enable ocamlopt native-code) \
+		$(use_enable profiling) \
+		$(use_enable zarith) \
+		$(use_enable zip)
+}
+
+src_compile() {
+	emake -j1
+	if use ocamlopt; then
+		emake byte
+	fi
+	use doc && emake doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install
+	emake DESTDIR="${D}" -j1 install-lib
+	emake DESTDIR="${D}" install_spark2014_dev
+	einstalldocs
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
+	if use doc; then
+		dodoc doc/manual.pdf
+		use html && dodoc -r doc/html
+	fi
+}
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 828f12151859..3c8b680ed154 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild
deleted file mode 100644
index 8bbf2f4b5b10..000000000000
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="abrt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for abrt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..16244467e5a4
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="abrt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild
deleted file mode 100644
index e521b0dcc2e8..000000000000
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="accountsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for accountsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a4d002b6a69b
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="accountsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild
deleted file mode 100644
index 1455ef2d30b4..000000000000
--- a/sec-policy/selinux-acct/selinux-acct-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bb4f2d3ea880
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild
deleted file mode 100644
index 2d5796f9461b..000000000000
--- a/sec-policy/selinux-ada/selinux-ada-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ada"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ada"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b224e8eab965
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ada"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild
deleted file mode 100644
index 81eaa17a2782..000000000000
--- a/sec-policy/selinux-afs/selinux-afs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="afs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for afs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8b497cad73df
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="afs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild
deleted file mode 100644
index e0a1e68af6e4..000000000000
--- a/sec-policy/selinux-aide/selinux-aide-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="aide"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for aide"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9764c0700398
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="aide"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild
deleted file mode 100644
index 7779979544f7..000000000000
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="alsa"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for alsa"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c13f83b1040f
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="alsa"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild
deleted file mode 100644
index 009f7e3b1e9a..000000000000
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amanda"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amanda"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6cce4fee502d
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="amanda"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild
deleted file mode 100644
index d960edbb1189..000000000000
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="amavis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for amavis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..35bcba26802e
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="amavis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild
deleted file mode 100644
index 754819bc2276..000000000000
--- a/sec-policy/selinux-android/selinux-android-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="android"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for android"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-java
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1090e96d263d
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20180701-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="android"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for android"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild
deleted file mode 100644
index 8af33686fcbe..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apache"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-kerberos
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-kerberos
-"
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..077ce01d6342
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apache"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-kerberos
+"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
deleted file mode 100644
index 18f55a8b17ad..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..67784a4a30c6
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
deleted file mode 100644
index d0e664f67c7b..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-pkg_postinst() {
-	# "apm" module got renamed to "acpi", must remove apm first
-	# the contexts are okay even tho the modules are not
-	# replaced in the same command (doesnt become unlabeled_t)
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild
deleted file mode 100644
index d0e664f67c7b..000000000000
--- a/sec-policy/selinux-apm/selinux-apm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-pkg_postinst() {
-	# "apm" module got renamed to "acpi", must remove apm first
-	# the contexts are okay even tho the modules are not
-	# replaced in the same command (doesnt become unlabeled_t)
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postinst
-}
-
-pkg_postrm() {
-	for i in ${POLICY_TYPES}; do
-		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
-			semodule -s "${i}" -r apm
-		fi
-	done
-	selinux-policy-2_pkg_postrm
-}
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a5f7f30b0e7a
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20180701-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acpi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acpi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+pkg_postinst() {
+	# "apm" module got renamed to "acpi", must remove apm first
+	# the contexts are okay even tho the modules are not
+	# replaced in the same command (doesnt become unlabeled_t)
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postinst
+}
+
+pkg_postrm() {
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postrm
+}
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild
deleted file mode 100644
index 750ca85588f5..000000000000
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="arpwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for arpwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a07ffc2e1c8f
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="arpwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild
deleted file mode 100644
index 62ff34ffcdf0..000000000000
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="asterisk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for asterisk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..76ca59655949
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="asterisk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild
deleted file mode 100644
index 2033d520758c..000000000000
--- a/sec-policy/selinux-at/selinux-at-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="at"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for at"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d5d07f6dd98d
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="at"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild
deleted file mode 100644
index a3cfbe6ac4f2..000000000000
--- a/sec-policy/selinux-automount/selinux-automount-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="automount"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for automount"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..98c74562e3e3
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild
deleted file mode 100644
index 70871b2b615d..000000000000
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="avahi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for avahi"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ff1e5370ad15
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="avahi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild
deleted file mode 100644
index 95cae5acdab5..000000000000
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="awstats"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for awstats"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..967aa579c24d
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="awstats"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild
deleted file mode 100644
index b29860f1c7e0..000000000000
--- a/sec-policy/selinux-backup/selinux-backup-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="backup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for generic backup apps"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..235b2655afe2
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="backup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup apps"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild
deleted file mode 100644
index cde85a82b54b..000000000000
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bacula"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bacula"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b50372799c1e
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bacula"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
deleted file mode 100644
index a72df4c245a4..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
deleted file mode 100644
index a72df4c245a4..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-DESCRIPTION="SELinux policy for core modules"
-
-IUSE="systemd +unconfined"
-
-PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
-DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
-
-MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/"
-
-# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
-# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
-# added) needs to remain then.
-
-pkg_setup() {
-	if use systemd; then
-		MODS="${MODS} systemd"
-	fi
-}
-
-pkg_pretend() {
-	for i in ${POLICY_TYPES}; do
-		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
-			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
-		fi
-	done
-}
-
-src_prepare() {
-	local modfiles
-
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	# Collect only those files needed for this particular module
-	for i in ${MODS}; do
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
-		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
-		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
-			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
-
-		cp ${modfiles} "${S}"/${i} \
-			|| die "Failed to copy the module files to ${S}/${i}"
-	done
-}
-
-src_compile() {
-	for i in ${POLICY_TYPES}; do
-		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local BASEDIR="/usr/share/selinux"
-
-	for i in ${POLICY_TYPES}; do
-		for j in ${MODS}; do
-			einfo "Installing ${i} ${j} policy package"
-			insinto ${BASEDIR}/${i}
-			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
-		done
-	done
-}
-
-pkg_postinst() {
-	# Override the command from the eclass, we need to load in base as well here
-	local COMMAND="-i base.pp"
-	if has_version "<sys-apps/policycoreutils-2.5"; then
-		COMMAND="-b base.pp"
-	fi
-
-	for i in ${MODS}; do
-		COMMAND="${COMMAND} -i ${i}.pp"
-	done
-
-	for i in ${POLICY_TYPES}; do
-		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
-
-		cd /usr/share/selinux/${i}
-
-		semodule -s ${i} ${COMMAND}
-	done
-
-	# Relabel depending packages
-	local PKGSET="";
-	if [[ -x /usr/bin/qdepends ]] ; then
-		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	elif [[ -x /usr/bin/equery ]] ; then
-		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
-	fi
-	if [[ -n "${PKGSET}" ]] ; then
-		rlpkg ${PKGSET};
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f68a3519c796
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+RDEPEND="$DEPEND"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_setup() {
+	if use systemd; then
+		MODS="${MODS} systemd"
+	fi
+}
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Set root path and don't load policy into the kernel when cross compiling
+	local root_opts=""
+	if [[ "${ROOT%/}" != "" ]]; then
+		root_opts="-p ${ROOT%/} -n"
+	fi
+
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND="-i base.pp"
+	if has_version "<sys-apps/policycoreutils-2.5"; then
+		COMMAND="-b base.pp"
+	fi
+
+	for i in ${MODS}; do
+		COMMAND="${COMMAND} -i ${i}.pp"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd "${ROOT%/}/usr/share/selinux/${i}"
+
+		semodule ${root_opts} -s ${i} ${COMMAND}
+	done
+
+	# Don't relabel when cross compiling
+	if [[ "${ROOT%/}" == "" ]]; then
+		# Relabel depending packages
+		local PKGSET="";
+		if [[ -x /usr/bin/qdepends ]] ; then
+			PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		elif [[ -x /usr/bin/equery ]] ; then
+			PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+		fi
+		if [[ -n "${PKGSET}" ]] ; then
+			rlpkg ${PKGSET};
+		fi
+	fi
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index b2976ccee54b..f68a3519c796 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 
 	inherit git-r3
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
 	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
 fi
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
deleted file mode 100644
index 072e411f021f..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
deleted file mode 100644
index 072e411f021f..000000000000
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
-	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
-
-	inherit git-r3
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
-			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
-
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-apps/policycoreutils-2.3
-	virtual/udev"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.3"
-
-S=${WORKDIR}/
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		einfo "Applying SELinux policy updates ... "
-		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
-	fi
-
-	eapply_user
-
-	cd "${S}/refpolicy" || die
-	emake bare
-}
-
-src_configure() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	# Update the SELinux refpolicy capabilities based on the users' USE flags.
-
-	if ! use peer_perms; then
-		sed -i -e '/network_peer_controls/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use open_perms; then
-		sed -i -e '/open_perms/d' \
-			"${S}/refpolicy/policy/policy_capabilities" || die
-	fi
-
-	if ! use ubac; then
-		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to disable User Based Access Control"
-	fi
-
-	if use systemd; then
-		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
-			|| die "Failed to enable SystemD"
-	fi
-
-	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
-
-	# Prepare initial configuration
-	cd "${S}/refpolicy" || die
-	emake conf || die "Make conf failed"
-
-	# Setup the policies based on the types delivered by the end user.
-	# These types can be "targeted", "strict", "mcs" and "mls".
-	for i in ${POLICY_TYPES}; do
-		cp -a "${S}/refpolicy" "${S}/${i}" || die
-		cd "${S}/${i}" || die
-
-		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
-		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
-
-		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
-			"${S}/${i}/build.conf" || die "build.conf setup failed."
-
-		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
-		then
-			# MCS/MLS require additional settings
-			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
-				|| die "failed to set type to mls"
-		fi
-
-		if [ "${i}" == "targeted" ]; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-standard/seusers" \
-			|| die "targeted seusers setup failed."
-		fi
-
-		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
-			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
-			"${S}/${i}/config/appconfig-${i}/seusers" \
-			|| die "policy seusers setup failed."
-		fi
-	done
-}
-
-src_compile() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-		emake base
-		if use doc; then
-			emake html
-		fi
-	done
-}
-
-src_install() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
-
-	for i in ${POLICY_TYPES}; do
-		cd "${S}/${i}" || die
-
-		emake DESTDIR="${D}" install \
-			|| die "${i} install failed."
-
-		emake DESTDIR="${D}" install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-
-		if use doc; then
-			docinto ${i}/html
-			dodoc -r doc/html/*;
-		fi
-
-		insinto /usr/share/selinux/devel;
-		doins doc/policy.xml;
-
-	done
-
-	docinto /
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	doman man/man8/*.8;
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-
-	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/selinux.conf"
-}
diff --git a/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..000ddea14dd4
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.8
+	virtual/udev"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.8"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	cd "${S}/refpolicy" || die
+	emake bare
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	if use systemd; then
+		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to enable SystemD"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy" || die
+	emake conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}" || die
+		cd "${S}/${i}" || die
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+		emake base
+		if use doc; then
+			emake html
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+
+		emake DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		emake DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			docinto ${i}/html
+			dodoc -r doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	docinto /
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/selinux.conf"
+}
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index b779ed9e7cf9..000ddea14dd4 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 
 	inherit git-r3
 else
-	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
 	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
@@ -23,11 +23,11 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND=">=sys-apps/policycoreutils-2.7
+RDEPEND=">=sys-apps/policycoreutils-2.8
 	virtual/udev"
 DEPEND="${RDEPEND}
 	sys-devel/m4
-	>=sys-apps/checkpolicy-2.7"
+	>=sys-apps/checkpolicy-2.8"
 
 S=${WORKDIR}/
 
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild
deleted file mode 100644
index f7758b06f680..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c08eed19e706
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild
deleted file mode 100644
index a2b7fd41fa87..000000000000
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitcoin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitcoin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6b32fb1c8d60
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bitcoin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitcoin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild
deleted file mode 100644
index 7ccc7d516bc1..000000000000
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bitlbee"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bitlbee"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..78fbf6bdc40b
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bitlbee"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild
deleted file mode 100644
index 9a5acf93c291..000000000000
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="bluetooth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluetooth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e708bb5381a9
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="bluetooth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild
deleted file mode 100644
index 794feb3c8c3d..000000000000
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="brctl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for brctl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e160f1e6735f
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="brctl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild
deleted file mode 100644
index b1a424794c25..000000000000
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cachefilesd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cachefilesd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..99c5f3d0bc6a
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cachefilesd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild
deleted file mode 100644
index 1e304e912d33..000000000000
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="calamaris"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for calamaris"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..799409419ec1
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="calamaris"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..33f018f5f6ce
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="canna"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild
deleted file mode 100644
index 1d8cdadadb25..000000000000
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ccs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ccs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..40dac97d118c
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ccs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild
deleted file mode 100644
index b8e9c33e8dbd..000000000000
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cdrecord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cdrecord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a7f9587a269c
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cdrecord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild
deleted file mode 100644
index 2718ef75f150..000000000000
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ceph"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ceph"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..760e26def4d1
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ceph"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ceph"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild
deleted file mode 100644
index 24e72162f472..000000000000
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4e076e8694ad
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild
deleted file mode 100644
index bc51a313709b..000000000000
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cgroup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cgroup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..885e7b0cb6d5
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cgroup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild
deleted file mode 100644
index 4785cfb100af..000000000000
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="chromium"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chromium"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1698c89c8ec8
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="chromium"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild
deleted file mode 100644
index d1960499b90d..000000000000
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="chronyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for chronyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1d020ca13aec
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="chronyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild
deleted file mode 100644
index cf4980f98ff0..000000000000
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clamav"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clamav"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e65376ea36cd
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clamav"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild
deleted file mode 100644
index 9818b65bed95..000000000000
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="clockspeed"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for clockspeed"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d83bc877500c
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="clockspeed"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild
deleted file mode 100644
index 8ff30ae5f2e1..000000000000
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="collectd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for collectd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..72250ed6c043
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild
deleted file mode 100644
index 05ee08f64f2c..000000000000
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="consolekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for consolekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..084d9430ec27
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="consolekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild
deleted file mode 100644
index a5e3c2a8632c..000000000000
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="corosync"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for corosync"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dd5454d318ad
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="corosync"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild
deleted file mode 100644
index 424eb13f89ea..000000000000
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="couchdb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for couchdb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..941f36368fcd
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="couchdb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild
deleted file mode 100644
index bd2859fe885e..000000000000
--- a/sec-policy/selinux-courier/selinux-courier-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="courier"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for courier"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0bffc4d35084
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="courier"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild
deleted file mode 100644
index 313aff5ad2fd..000000000000
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpucontrol"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpucontrol"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5c59da7db4eb
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cpucontrol"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild
deleted file mode 100644
index 33095e87ded9..000000000000
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cpufreqselector"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cpufreqselector"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4644b016b922
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cpufreqselector"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild
deleted file mode 100644
index f5d7e97be718..000000000000
--- a/sec-policy/selinux-cups/selinux-cups-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cups"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cups"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-lpd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-lpd
-"
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..45dc986ba8b0
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cups"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-lpd
+"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
deleted file mode 100644
index 01387904e784..000000000000
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cvs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cvs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..582dc0abdc03
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild
deleted file mode 100644
index 24ef891db8cc..000000000000
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="cyphesis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for cyphesis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4bbdb67ee7e1
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cyphesis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild
deleted file mode 100644
index 1f23f5162145..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="daemontools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for daemontools"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3927f59ea456
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="daemontools"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild
deleted file mode 100644
index 3557637d05e8..000000000000
--- a/sec-policy/selinux-dante/selinux-dante-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dante"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dante"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4e8f92b6d411
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dante"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild
deleted file mode 100644
index ecf1d5968039..000000000000
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbadm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbadm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..862759a2ffb5
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbadm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild
deleted file mode 100644
index c08daf48574f..000000000000
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbskk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbskk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..98edbc85d0ba
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbskk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild
deleted file mode 100644
index f96c24e0ab6b..000000000000
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dbus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dbus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c24f8df7469e
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dbus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild
deleted file mode 100644
index 9878e953a6df..000000000000
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e6cabc4e2e37
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild
deleted file mode 100644
index c331ba78ff2c..000000000000
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddclient"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddclient"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a4a614ec0441
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddclient"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild
deleted file mode 100644
index 429e77fdd693..000000000000
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ddcprobe"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ddcprobe"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..7610bd34daae
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ddcprobe"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild
deleted file mode 100644
index dd82b4469eb7..000000000000
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="denyhosts"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for denyhosts"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..877366a77e16
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="denyhosts"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild
deleted file mode 100644
index d125b8879229..000000000000
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="devicekit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for devicekit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8635987d27c4
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="devicekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild
deleted file mode 100644
index fd486e8a3107..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dhcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dhcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..75aea97a567e
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dhcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild
deleted file mode 100644
index 3bc15bd2b29c..000000000000
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dictd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dictd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2d32bb503a41
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dictd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index d476ac269060..f5e0ee90504d 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -1,4 +1,6 @@
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0416233eb076
--- /dev/null
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirmngr"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirmngr"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild
deleted file mode 100644
index fdea3c6062de..000000000000
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dirsrv"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dirsrv"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a55356877e2a
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dirsrv"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild
deleted file mode 100644
index 6cf879968a47..000000000000
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="distcc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for distcc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..111905d35fc6
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="distcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild
deleted file mode 100644
index 6af0fe9551b2..000000000000
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="djbdns"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for djbdns"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-daemontools
-	sec-policy/selinux-ucspitcp
-"
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6d03e0a05302
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="djbdns"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild
deleted file mode 100644
index e8bc10bc3959..000000000000
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dkim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dkim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-milter
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-milter
-"
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..725721271283
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dkim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-milter
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-milter
+"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild
deleted file mode 100644
index bd6f8395e534..000000000000
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dmidecode"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dmidecode"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8e615d71505e
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dmidecode"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild
deleted file mode 100644
index 3b6d5fbe2cf5..000000000000
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dnsmasq"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dnsmasq"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e12df6ce58f6
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dnsmasq"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild
deleted file mode 100644
index 27872911b461..000000000000
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dovecot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dovecot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3f4f764487e3
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dovecot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild
deleted file mode 100644
index aec4a7de2677..000000000000
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dpkg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dpkg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0458ecafbca5
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dpkg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild
deleted file mode 100644
index cf5ba1764a89..000000000000
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dracut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dracut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ab4f4e3bd132
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dracut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild
deleted file mode 100644
index 363f44cec3e0..000000000000
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="dropbox"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for dropbox"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d25d2723627f
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20180701-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="dropbox"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild
deleted file mode 100644
index b161e431a80f..000000000000
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="entropyd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for entropyd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d58341e4fc36
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="entropyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild
deleted file mode 100644
index 91acf3bb059b..000000000000
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="evolution"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for evolution"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c5fb02648452
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="evolution"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild
deleted file mode 100644
index 04c9e431e452..000000000000
--- a/sec-policy/selinux-exim/selinux-exim-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="exim"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for exim"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..73ffc301d15c
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="exim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild
deleted file mode 100644
index 845bdb9e2354..000000000000
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fail2ban"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fail2ban"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2135a7bb5fb7
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fail2ban"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild
deleted file mode 100644
index 66140edae922..000000000000
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fetchmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fetchmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1c4c778ba5af
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fetchmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild
deleted file mode 100644
index db0f3afa26f2..000000000000
--- a/sec-policy/selinux-finger/selinux-finger-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="finger"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for finger"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..04668c6ca0b6
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="finger"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild
deleted file mode 100644
index c323d6d1b044..000000000000
--- a/sec-policy/selinux-flash/selinux-flash-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="flash"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for flash"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..09267ae8a349
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="flash"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild
deleted file mode 100644
index a683af902859..000000000000
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="fprintd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for fprintd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0e40c0e7a66c
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="fprintd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild
deleted file mode 100644
index 9d26c095cd26..000000000000
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6353d9496e45
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild
deleted file mode 100644
index d512c656bda1..000000000000
--- a/sec-policy/selinux-games/selinux-games-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="games"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for games"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4057d0081474
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="games"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild
deleted file mode 100644
index ceccf09bb602..000000000000
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gatekeeper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gatekeeper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c10d2e7e7c9f
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gatekeeper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild
deleted file mode 100644
index 2e5c586bcc2c..000000000000
--- a/sec-policy/selinux-git/selinux-git-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="git"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for git"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c88c3cfb5859
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="git"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for git"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild
deleted file mode 100644
index a8675b63b73f..000000000000
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gitosis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gitosis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0f2fb118b3e1
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gitosis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild
deleted file mode 100644
index 3053d928e565..000000000000
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gnome"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gnome"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0038031ba9d5
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gnome"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild
deleted file mode 100644
index 485e75461fa7..000000000000
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="googletalk"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for googletalk"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..715779dd67c1
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="googletalk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild
deleted file mode 100644
index 447dca165e3a..000000000000
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gorg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gorg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1538462400a9
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gorg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild
deleted file mode 100644
index 9ee3d3257b12..000000000000
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..34f5b61061ad
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dirmngr
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dirmngr
+"
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild
deleted file mode 100644
index fd4ff754ca46..000000000000
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9a99c34dc431
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild
deleted file mode 100644
index f0ea0d9089e3..000000000000
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gpsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gpsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bf438a7ffa19
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gpsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index 13389b16b2af..f5e0ee90504d 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -1,6 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild
deleted file mode 100644
index 0a3cb07df42d..000000000000
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="gssproxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for gssproxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5ec1fa45c248
--- /dev/null
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="gssproxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gssproxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild
deleted file mode 100644
index d987e86caa40..000000000000
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="hddtemp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for hddtemp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9cadc59e8777
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="hddtemp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild
deleted file mode 100644
index 450b071d9cae..000000000000
--- a/sec-policy/selinux-howl/selinux-howl-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="howl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for howl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ce74d9396b95
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="howl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild
deleted file mode 100644
index b94587eb4e73..000000000000
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="icecast"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for icecast"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..738fc05228ae
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="icecast"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild
deleted file mode 100644
index b06316edc59a..000000000000
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ifplugd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ifplugd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..41ac6475c514
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ifplugd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild
deleted file mode 100644
index c9149c10a566..000000000000
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="imaze"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for imaze"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..934faa978982
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="imaze"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild
deleted file mode 100644
index 61e8f5d044fc..000000000000
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inetd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inetd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9330c3d1d3ae
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="inetd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild
deleted file mode 100644
index e296b2b3892e..000000000000
--- a/sec-policy/selinux-inn/selinux-inn-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="inn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for inn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2f668dd26f26
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="inn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild
deleted file mode 100644
index 466fe9db0faf..000000000000
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ipsec"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..afe4efc9a73b
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild
deleted file mode 100644
index 6afd2f64a468..000000000000
--- a/sec-policy/selinux-irc/selinux-irc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..248af928b807
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="irc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild
deleted file mode 100644
index 224993627a11..000000000000
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1b5dc73ec5b9
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild
deleted file mode 100644
index d882023aed99..000000000000
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="irqbalance"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for irqbalance"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4d7b25864b7e
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="irqbalance"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild
deleted file mode 100644
index 7839c32713ca..000000000000
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="jabber"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5cda0ea5f16b
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="jabber"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild
deleted file mode 100644
index 382b26fa4cac..000000000000
--- a/sec-policy/selinux-java/selinux-java-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="java"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for java"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d9242ad11ef6
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="java"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild
deleted file mode 100644
index 07464ddad1ed..000000000000
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdeconnect"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdeconnect"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d0153053b417
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kdeconnect"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdeconnect"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild
deleted file mode 100644
index 5529a3914ce1..000000000000
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kdump"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kdump"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..658c34f327a3
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kdump"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild
deleted file mode 100644
index e583ae84114b..000000000000
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerberos"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerberos"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3c70dba4223c
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kerberos"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild
deleted file mode 100644
index c4ad389d33db..000000000000
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kerneloops"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kerneloops"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ce419430b0ed
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kerneloops"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild
deleted file mode 100644
index e541ecf0d9da..000000000000
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kismet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kismet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9de91d19d567
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kismet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild
deleted file mode 100644
index f87f6d8a97db..000000000000
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ksmtuned"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ksmtuned"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..acb143010d43
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ksmtuned"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild
deleted file mode 100644
index 2c68ff3064dc..000000000000
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="kudzu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for kudzu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..45827dff4600
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="kudzu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild
deleted file mode 100644
index 66544777383b..000000000000
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ldap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ldap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..df0d6e69d5b3
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ldap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild
deleted file mode 100644
index 0ff1679a2579..000000000000
--- a/sec-policy/selinux-links/selinux-links-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="links"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for links"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..12a9b9d2e1a6
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="links"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild
deleted file mode 100644
index 366e54bdc751..000000000000
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lircd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lircd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b4d38f9204f1
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild
deleted file mode 100644
index 025692b422ba..000000000000
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="loadkeys"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for loadkeys"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f47cbc382bd5
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="loadkeys"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild
deleted file mode 100644
index 9629e202505e..000000000000
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lockdev"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lockdev"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..09c1bb019c76
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lockdev"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild
deleted file mode 100644
index 8e78ab257d42..000000000000
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logrotate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logrotate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..844b28f1c301
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logrotate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild
deleted file mode 100644
index 523ca2af3edd..000000000000
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logsentry"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logsentry"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b4593b5031c6
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logsentry"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild
deleted file mode 100644
index 1b00546dc81d..000000000000
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="logwatch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for logwatch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5e3afa99aab0
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="logwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild
deleted file mode 100644
index 721d9802aa83..000000000000
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="lpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for lpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c0511bb2d938
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="lpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild
deleted file mode 100644
index 600e865a80db..000000000000
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mailman"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mailman"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..984440327ed0
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mailman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild
deleted file mode 100644
index 9d093cdcf13d..000000000000
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="makewhatis"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for makewhatis"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cc05d1066e42
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="makewhatis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild
deleted file mode 100644
index cb215b310388..000000000000
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mandb"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mandb"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c8db292f4e56
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mandb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild
deleted file mode 100644
index 971821bbbd04..000000000000
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mcelog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mcelog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8ad129985e68
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mcelog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild
deleted file mode 100644
index 7542a10c4315..000000000000
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="memcached"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for memcached"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a835ef04fc2d
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="memcached"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild
deleted file mode 100644
index 99b5939f93e5..000000000000
--- a/sec-policy/selinux-milter/selinux-milter-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="milter"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for milter"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..415133d64542
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="milter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild
deleted file mode 100644
index 2f4d0eccee54..000000000000
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="modemmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for modemmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bcd8127f743d
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="modemmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild
deleted file mode 100644
index 4a1268d7ba59..000000000000
--- a/sec-policy/selinux-mono/selinux-mono-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mono"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mono"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1f2dc9e10a6b
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mono"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild
deleted file mode 100644
index d8777f6fa2e5..000000000000
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mozilla"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mozilla"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e2e9e97b72b5
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="mozilla"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild
deleted file mode 100644
index 7ec661829684..000000000000
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..304f5af1016c
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild
deleted file mode 100644
index 2b3ae984c26c..000000000000
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="mplayer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mplayer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fbc2e02fe8a6
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="mplayer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild
deleted file mode 100644
index 703cc95773bd..000000000000
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mrtg"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mrtg"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5a3b8257ed47
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mrtg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild
deleted file mode 100644
index a2537fc5f74b..000000000000
--- a/sec-policy/selinux-munin/selinux-munin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="munin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for munin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fd86c50e8c82
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild
deleted file mode 100644
index af31a44a05b3..000000000000
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mutt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mutt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2f811eb9e42e
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mutt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild
deleted file mode 100644
index 8f8b693543ed..000000000000
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="mysql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for mysql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..367f1ee95c27
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="mysql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
deleted file mode 100644
index 5cc4a9ef62eb..000000000000
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nagios"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nagios"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5bf419cc42d4
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild
deleted file mode 100644
index cce911b31108..000000000000
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ncftool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ncftool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a941042f000e
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ncftool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild
deleted file mode 100644
index e11434f3dbe6..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e3e8e63caa48
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nessus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild
deleted file mode 100644
index ff6dfece34ea..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for networkmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a6052e7f0e44
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="networkmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild
deleted file mode 100644
index 41b11469d6c8..000000000000
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nginx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nginx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..250ecf0ab249
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild
deleted file mode 100644
index 042b51887a29..000000000000
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nslcd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nslcd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..32a1b1cd1c32
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nslcd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild
deleted file mode 100644
index fef41238e825..000000000000
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntop"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntop"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..818cd6a734df
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ntop"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild
deleted file mode 100644
index f3c6f0b241b9..000000000000
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ntp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ntp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..430225fcdc26
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ntp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild
deleted file mode 100644
index 52278013312d..000000000000
--- a/sec-policy/selinux-nut/selinux-nut-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nut"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nut"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a4fb8098acf4
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild
deleted file mode 100644
index c69d81570ac5..000000000000
--- a/sec-policy/selinux-nx/selinux-nx-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nx"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nx"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..eaae5499cf3a
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="nx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild
deleted file mode 100644
index 05d81dbf6e35..000000000000
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oddjob"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oddjob"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6cf65e47af84
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="oddjob"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild
deleted file mode 100644
index 11bf08ade1c1..000000000000
--- a/sec-policy/selinux-oident/selinux-oident-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="oident"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for oident"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..931c5f14889c
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="oident"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild
deleted file mode 100644
index 9ee9b2f682a0..000000000000
--- a/sec-policy/selinux-openct/selinux-openct-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openct"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openct"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..accd8f695a5d
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild
deleted file mode 100644
index fa3eb713c887..000000000000
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openrc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openrc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f7967faa52e1
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openrc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild
deleted file mode 100644
index ba6de62cc44f..000000000000
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="openvpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for openvpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5814dd787ebf
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="openvpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild
deleted file mode 100644
index d460c840cdc3..000000000000
--- a/sec-policy/selinux-pan/selinux-pan-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pan"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pan"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c9aa8c17ed05
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pan"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild
deleted file mode 100644
index 29b5f976a9b6..000000000000
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcmcia"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcmcia"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f79f167b79a6
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcmcia"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild
deleted file mode 100644
index d7bd020019d8..000000000000
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pcscd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pcscd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..989d82a295c7
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pcscd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild
deleted file mode 100644
index e66923075b91..000000000000
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="perdition"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for perdition"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..d84c6e5b0da8
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="perdition"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild
deleted file mode 100644
index fc156736d5cf..000000000000
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="phpfpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for phpfpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..34cea65b1a0c
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild
deleted file mode 100644
index 4e3c8f552158..000000000000
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="plymouthd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for plymouthd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..241f5416f25e
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="plymouthd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild
deleted file mode 100644
index baa6c77f1dee..000000000000
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="podsleuth"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for podsleuth"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f17b187cb320
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="podsleuth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild
deleted file mode 100644
index 89e77cc4f8e7..000000000000
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="policykit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for policykit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..63984df43a0b
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="policykit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild
deleted file mode 100644
index 82ee01f0fd00..000000000000
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="portmap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for portmap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a62eeb9cf4c3
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="portmap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild
deleted file mode 100644
index d80d82971876..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postfix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postfix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c921b4c1e505
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postfix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild
deleted file mode 100644
index a1f50973b366..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgresql"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgresql"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ccdfdb169305
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postgresql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild
deleted file mode 100644
index db1666610044..000000000000
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="postgrey"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for postgrey"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a5da0c400ac3
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="postgrey"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild
deleted file mode 100644
index 6f9d3d996de4..000000000000
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ppp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ppp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5deee503f6f2
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ppp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild
deleted file mode 100644
index adc387dd5666..000000000000
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelink"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelink"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8dc9cf31cd90
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild
deleted file mode 100644
index 70194da11ac5..000000000000
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="prelude"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for prelude"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..346eb876da5d
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="prelude"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild
deleted file mode 100644
index 91deb19563de..000000000000
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="privoxy"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for privoxy"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..37dbabe24a88
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="privoxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild
deleted file mode 100644
index 3f1f915432ff..000000000000
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="procmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for procmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a898ad1b5e30
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="procmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild
deleted file mode 100644
index 094912a02bad..000000000000
--- a/sec-policy/selinux-psad/selinux-psad-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="psad"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for psad"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a0c481b2f48b
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="psad"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild
deleted file mode 100644
index e08956bbce63..000000000000
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="publicfile"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for publicfile"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1c14791a6816
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="publicfile"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild
deleted file mode 100644
index b9bc2de57be1..000000000000
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pulseaudio"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pulseaudio"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..21591c2d56ee
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pulseaudio"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild
deleted file mode 100644
index 1e54cd59cf9e..000000000000
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="puppet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for puppet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5f3399e38f63
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="puppet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild
deleted file mode 100644
index 09982db295aa..000000000000
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyicqt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyicqt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3ff7315fd87f
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyicqt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild
deleted file mode 100644
index 0ad570dad2d9..000000000000
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="pyzor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for pyzor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ec7ec7e951f3
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="pyzor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild
deleted file mode 100644
index 011cb0278ab4..000000000000
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qemu"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qemu"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-virt
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-virt
-"
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3ac8c85d7ff8
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="qemu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-virt
+"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild
deleted file mode 100644
index e9b5c9724763..000000000000
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="qmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for qmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..91f8c6d5ea57
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="qmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild
deleted file mode 100644
index 0af9af0d6630..000000000000
--- a/sec-policy/selinux-quota/selinux-quota-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="quota"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for quota"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..36e2461e5a20
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="quota"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild
deleted file mode 100644
index 5b124668c37b..000000000000
--- a/sec-policy/selinux-radius/selinux-radius-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radius"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radius"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5d61679de48d
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="radius"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild
deleted file mode 100644
index bef7d9af97e3..000000000000
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="radvd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for radvd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b92e3d1ca215
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="radvd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild
deleted file mode 100644
index 6baab7d2f481..000000000000
--- a/sec-policy/selinux-razor/selinux-razor-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="razor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for razor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1d3b49748dc1
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="razor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index 6cebb9fba587..fe8a96e69c86 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -1,3 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cf01a8f45bcb
--- /dev/null
+++ b/sec-policy/selinux-redis/selinux-redis-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="redis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for redis"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild
deleted file mode 100644
index 71d819dc07d1..000000000000
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="remotelogin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for remotelogin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8b28c4fbe3c5
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="remotelogin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild
deleted file mode 100644
index 42f62e6a45d7..000000000000
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="resolvconf"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for resolvconf"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e1fbd450a3b6
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="resolvconf"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for resolvconf"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild
deleted file mode 100644
index 512e893e0173..000000000000
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rgmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rgmanager"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c3ff16e532a0
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild
deleted file mode 100644
index 94b1d6c82413..000000000000
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rngd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rngd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cf9dea3431e6
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rngd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild
deleted file mode 100644
index 3f643b0125a9..000000000000
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="roundup"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for roundup"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2a695a0dcd64
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="roundup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild
deleted file mode 100644
index f2a514e5612c..000000000000
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpc"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpc"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dd191f5c475e
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild
deleted file mode 100644
index 9719bf26dcb3..000000000000
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpcbind"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpcbind"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..16c4589f6924
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpcbind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild
deleted file mode 100644
index 59bb7c84fd76..000000000000
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rpm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rpm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9b767ab57db8
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild
deleted file mode 100644
index 21d4a46f4368..000000000000
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rssh"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rssh"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..802637b63464
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rssh"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild
deleted file mode 100644
index d112318cb27c..000000000000
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtkit"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtkit"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-dbus
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-dbus
-"
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e3c7a6ffeeca
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rtkit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild
deleted file mode 100644
index dd1f6c8ef94b..000000000000
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="rtorrent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for rtorrent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3b601d633ec8
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="rtorrent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild
deleted file mode 100644
index 85eed76b3642..000000000000
--- a/sec-policy/selinux-salt/selinux-salt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="salt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for salt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bc84b0e7d7ea
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="salt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for salt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild
deleted file mode 100644
index 78c653fcbb84..000000000000
--- a/sec-policy/selinux-samba/selinux-samba-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="samba"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for samba"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3ab5f4c3c662
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="samba"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild
deleted file mode 100644
index 577d5c116604..000000000000
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sasl"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sasl"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5798ce3dd1bd
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sasl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild
deleted file mode 100644
index a82707f09fb1..000000000000
--- a/sec-policy/selinux-screen/selinux-screen-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="screen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for screen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..943274f4a0a3
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="screen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild
deleted file mode 100644
index 2731066a0876..000000000000
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sendmail"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sendmail"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..b94c5bf9764c
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sendmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild
deleted file mode 100644
index dec54296bc72..000000000000
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sensord"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sensord"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4247b25372f9
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sensord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild
deleted file mode 100644
index dbaa7c21f7c9..000000000000
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shorewall"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shorewall"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dfd988330a21
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="shorewall"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild
deleted file mode 100644
index c046de54cbb4..000000000000
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="shutdown"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for shutdown"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a1ee5c0570e9
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="shutdown"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild
deleted file mode 100644
index 5bc6c4afe878..000000000000
--- a/sec-policy/selinux-skype/selinux-skype-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE="alsa"
-MODS="skype"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for skype"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..0ae995509331
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE="alsa"
+MODS="skype"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild
deleted file mode 100644
index 9fa5b68e5434..000000000000
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slocate"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slocate"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8393ac0bfd57
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="slocate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild
deleted file mode 100644
index 69221061cb64..000000000000
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="slrnpull"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for slrnpull"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3602a91bf185
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="slrnpull"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild
deleted file mode 100644
index 36aaabb2cebf..000000000000
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smartmon"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smartmon"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..bda18992ab22
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="smartmon"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild
deleted file mode 100644
index 9f12ac25cb12..000000000000
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="smokeping"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for smokeping"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..764fbe3b4119
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="smokeping"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild
deleted file mode 100644
index 01575533a1eb..000000000000
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snmp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snmp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..432be580324f
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="snmp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild
deleted file mode 100644
index 08d277ba8239..000000000000
--- a/sec-policy/selinux-snort/selinux-snort-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="snort"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for snort"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2a79291258ea
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="snort"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild
deleted file mode 100644
index 7834a39e4c90..000000000000
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="soundserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for soundserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2ff6085dc186
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="soundserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild
deleted file mode 100644
index 97b3d713e960..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="spamassassin"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for spamassassin"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..909e42792205
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild
deleted file mode 100644
index 77e844e3803e..000000000000
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="speedtouch"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for speedtouch"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..c9c31f9b77ac
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="speedtouch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild
deleted file mode 100644
index 473a40019dda..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="squid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for squid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..21f8d9686c17
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild
deleted file mode 100644
index 079338b4f98e..000000000000
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sssd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sssd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ba214289acee
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sssd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild
deleted file mode 100644
index def3fd49aa87..000000000000
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="stunnel"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for stunnel"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6d44c6fdbaad
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild
deleted file mode 100644
index 03d0da972a08..000000000000
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="subsonic"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for subsonic"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..452f4a422fcd
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="subsonic"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for subsonic"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild
deleted file mode 100644
index 805037ec8a00..000000000000
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sudo"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sudo"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..f170453419a4
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sudo"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild
deleted file mode 100644
index 53981821277d..000000000000
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sxid"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sxid"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..73566a466c1a
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sxid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
deleted file mode 100644
index f09aa093c1f5..000000000000
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="syncthing"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for syncthing"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fb45ab18b9ca
--- /dev/null
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="syncthing"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for syncthing"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild
deleted file mode 100644
index 6a019365f64c..000000000000
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="sysstat"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for sysstat"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1551a51a365a
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="sysstat"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild
deleted file mode 100644
index 9e6ed3ef669c..000000000000
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tboot"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tboot"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..71edee22c6c5
--- /dev/null
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tboot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tboot"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild
deleted file mode 100644
index 18e3c007e6c0..000000000000
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcpd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcpd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..dbaebf94c9a4
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tcpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild
deleted file mode 100644
index 070a4fc6fff8..000000000000
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tcsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tcsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..adc49785ec0a
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tcsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild
deleted file mode 100644
index 1ca26530766f..000000000000
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="telnet"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for telnet"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-remotelogin
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-remotelogin
-"
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ed9362153891
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="telnet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-remotelogin
+"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild
deleted file mode 100644
index e0fd48b2a2c5..000000000000
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tftp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tftp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6a14788e1b36
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild
deleted file mode 100644
index ccf0acbaf89c..000000000000
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tgtd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tgtd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..6df710db4630
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tgtd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
deleted file mode 100644
index 7ead7c22e75c..000000000000
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="thunderbird"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for thunderbird"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..fe691d8cd407
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="thunderbird"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild
deleted file mode 100644
index 5142bf04b71c..000000000000
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="timidity"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for timidity"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4be6efafc96c
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="timidity"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild
deleted file mode 100644
index b75a1daff5d6..000000000000
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tmpreaper"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tmpreaper"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..49add2559ade
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tmpreaper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild
deleted file mode 100644
index bd211fc676fc..000000000000
--- a/sec-policy/selinux-tor/selinux-tor-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tor"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tor"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5aa55ea732f0
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild
deleted file mode 100644
index fd6e987a85a9..000000000000
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="tripwire"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for tripwire"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..748273d6d53f
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="tripwire"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild
deleted file mode 100644
index eb74383dee3b..000000000000
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ucspitcp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ucspitcp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a8d12b4fad56
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ucspitcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild
deleted file mode 100644
index 21dfb6cfe665..000000000000
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="ulogd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ulogd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8dd9622e1527
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="ulogd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild
deleted file mode 100644
index 7f5c71535ec1..000000000000
--- a/sec-policy/selinux-uml/selinux-uml-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uml"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uml"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..64e52e582f92
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uml"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild
deleted file mode 100644
index f5d4a5975a3e..000000000000
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="unconfined"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for unconfined"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..43c9b7b8e9b3
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="unconfined"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild
deleted file mode 100644
index 5a87d03a0013..000000000000
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uptime"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uptime"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..ebc62cef7c80
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uptime"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild
deleted file mode 100644
index e2e4e1d57829..000000000000
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="usbmuxd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for usbmuxd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5b87f855a57e
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="usbmuxd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild
deleted file mode 100644
index 969d32f72b87..000000000000
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uucp"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uucp"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-inetd
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-inetd
-"
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..8c9d51902f24
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uucp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild
deleted file mode 100644
index b475676e6381..000000000000
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwimap"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uwimap"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..51464c765d13
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uwimap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild
deleted file mode 100644
index 1b94bdcad05b..000000000000
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="uwsgi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for uWSGI"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..e25f57d05481
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="uwsgi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uWSGI"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild
deleted file mode 100644
index 7a2f763d1f29..000000000000
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="varnishd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for varnishd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..32059274afa4
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="varnishd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild
deleted file mode 100644
index b63eaefd1be6..000000000000
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vbetool"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vbetool"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..9028867c2cf0
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vbetool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild
deleted file mode 100644
index ca4e87518c36..000000000000
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vdagent"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vdagent"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cc7d763e03dd
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vdagent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild
deleted file mode 100644
index f0957f8c5d3f..000000000000
--- a/sec-policy/selinux-vde/selinux-vde-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vde"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vde"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..69c143bd9777
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vde"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild
deleted file mode 100644
index 6c625e778520..000000000000
--- a/sec-policy/selinux-virt/selinux-virt-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="virt"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for virt"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..4c2b8e1ee3ad
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="virt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild
deleted file mode 100644
index 292f78fe8861..000000000000
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vlock"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vlock"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..5ceb572ace30
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vlock"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild
deleted file mode 100644
index 8f875de1fced..000000000000
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vmware"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vmware"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..85939ad36b26
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vmware"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild
deleted file mode 100644
index cfefdd158567..000000000000
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vnstatd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vnstatd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a96ef5b2ccad
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vnstatd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild
deleted file mode 100644
index bd9a0bb823e3..000000000000
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="vpn"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for vpn"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..7132c9718995
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="vpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild
deleted file mode 100644
index fad30c50079d..000000000000
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="watchdog"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for watchdog"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..3bf64e50b5ac
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild
deleted file mode 100644
index 2d855739245b..000000000000
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="webalizer"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for webalizer"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..1faf79c01338
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20180701-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="webalizer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild
deleted file mode 100644
index b3e3abbe3939..000000000000
--- a/sec-policy/selinux-wine/selinux-wine-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wine"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wine"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2d14db60213d
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wine"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild
deleted file mode 100644
index 60ec7ab1acdf..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wireshark"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a53c36b9a8b4
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wireshark"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild
deleted file mode 100644
index dadc5193812c..000000000000
--- a/sec-policy/selinux-wm/selinux-wm-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="wm"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wm"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..356ec814381b
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="wm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild
deleted file mode 100644
index a046cb71491c..000000000000
--- a/sec-policy/selinux-xen/selinux-xen-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xen"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xen"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a03e6da72146
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild
deleted file mode 100644
index bd58f42cd8ff..000000000000
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xfs"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xfs"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..cf06c723ddfd
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xfs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild
deleted file mode 100644
index e0a484593be8..000000000000
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xprint"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xprint"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..403d7b9730b2
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xprint"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild
deleted file mode 100644
index 18f231a7f287..000000000000
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xscreensaver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xscreensaver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-xserver
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-xserver
-"
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..2fde998e703d
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20180701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xscreensaver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
deleted file mode 100644
index 9fdf569dc086..000000000000
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="xserver"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for xserver"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..a32bb13fcdbb
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="xserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 95a5760320cd..f5e0ee90504d 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -1,7 +1,6 @@
-DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
-DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
+DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
+DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild
deleted file mode 100644
index 1855783c9e50..000000000000
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20170805-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="zabbix"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for zabbix"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild
new file mode 100644
index 000000000000..60a2bf7d34cf
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20180701-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="zabbix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3ac9b7079ac2..f2b21008b0ac 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/coreutils/coreutils-8.29-r1.ebuild b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
index 0eb78f2cdac7..945e33375212 100644
--- a/sys-apps/coreutils/coreutils-8.29-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 7b9b5c1ad8d2..a46369abfcfd 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,2 +1,2 @@
-DIST fwupd-1.0.6.tar.gz 1569675 BLAKE2B 1e6b4acc52696cc08086647ce69d4901e78201817423a53f1a6af5f9c5b7be658a5f343c88aa358788aa9d51859b29d8ea7269ec855841652a37a88ba577e01e SHA512 8daaf5d5cb91260c443448a874f92d948bf878dc44c586dbd4a75323dd834ba3b106fe570e30c7a0aefe4c4a7008b6db1ec2948a948b3fb94906ef1fe3f2e35a
 DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e
+DIST fwupd-1.1.0.tar.gz 1636214 BLAKE2B 492c33eb54852dd7d73f511dd6e5aa222b35e1898105bbfb291e1095c3968101597185cff2a1889e9da5728fdd0c8d4638e7e2102b12cf7659a1b6612ca0e9b7 SHA512 058d4564cf922b5056f6197261d77b97db7238a1658d69d9b29bec70a44542a5a131071935747e0cc963661a61b242ca98375ed8da920f819d37a706aec0c2ae
diff --git a/sys-apps/fwupd/fwupd-1.0.6.ebuild b/sys-apps/fwupd/fwupd-1.0.6.ebuild
deleted file mode 100644
index bf7962018270..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13:=[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	pkcs7? ( net-libs/gnutls:= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	virtual/pkgconfig
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_colorhug="$(usex colorhug true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged (yet?)
-		-Dplugin_thunderbolt=false
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.8.ebuild b/sys-apps/fwupd/fwupd-1.0.8.ebuild
deleted file mode 100644
index b1dbd1d0395c..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Package requires newer meson than eclass provides
-MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.7.4:=[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-10 )
-	uefi_labels? (
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	>=dev-util/meson-0.41.0
-	>=dev-util/ninja-1.7.2
-	virtual/pkgconfig
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_colorhug="$(usex colorhug true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged (yet?)
-		-Dplugin_thunderbolt=false
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.1.0.ebuild b/sys-apps/fwupd/fwupd-1.1.0.ebuild
new file mode 100644
index 000000000000..4bf84845fd06
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.1.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit meson python-single-r1 vala xdg-utils
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc gpg +man pkcs7 redfish systemd test uefi"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dell? ( uefi )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/appstream-glib-0.7.4:=[introspection]
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	>=net-libs/libsoup-2.51.92:2.4[introspection]
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? (
+		dev-libs/json-glib
+		sys-libs/efivar
+	)
+	systemd? ( >=sys-apps/systemd-211 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/gcab
+	app-arch/libarchive
+	>=dev-util/meson-0.41.0
+	>=dev-util/ninja-1.7.2
+	virtual/pkgconfig
+	$(vala_depend)
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	test? ( net-libs/gnutls[tools] )
+"
+
+src_prepare() {
+	default
+	sed -e "s/'--create'/'--absolute-name', '--create'/" \
+		-i data/tests/builder/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_redfish="$(usex redfish true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		# requires libtbtfwu which is not packaged (yet?)
+		-Dplugin_thunderbolt=false
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index db5cd052b861..b15f190a058b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -12,6 +12,7 @@
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg>.</flag>
+    <flag name="redfish">Install redfish plugin</flag>
     <flag name="uefi">Enable UEFI support</flag>
     <flag name="uefi_labels">Enable UEFI labels support</flag>
   </use>
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index cada1bdf19e2..cd052f0b3fa7 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,3 +1,4 @@
 DIST pciutils-3.4.1.tar.gz 404166 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.0.tar.gz 454912 BLAKE2B 1f37307ba21085d5f49dd908781ce34dff98a1e4d818158800a1fbdc1fc689e1b868ee9c762378a8cd28ab17cbaaf1e9255da94c44029bfa2f4a8b5d9fd4b273 SHA512 e59cb5685f1dee2673368c90fdf1f5b7689de9fa45f249ce472258f278288da7a81644c76d1ecb7cc857f8029d3d70c367fe62190caf55328143b51017cc5c6f
+DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
new file mode 100644
index 000000000000..4fa617e1c488
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208[static-libs(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	kmod? ( sys-apps/kmod )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwids
+"
+DEPEND="
+	${DEPEND}
+	kmod? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+src_prepare() {
+	default
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-lfs-flags #471102
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/misc' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}/static" \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+		"${ED}"/usr/share/man/man8/update-pciids.8*
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+	fi
+}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index ec23d184ad72..a93fc1f8ff9a 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,2 +1 @@
-DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
diff --git a/sys-apps/sed/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch
deleted file mode 100644
index 89679c5362e3..000000000000
--- a/sys-apps/sed/files/sed-4.1.5-alloca.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix building on BSD systems which often do not have alloca.h
-
---- sed-4.1.5/lib/regex_internal.h
-+++ sed-4.1.5/lib/regex_internal.h
-@@ -410,7 +410,9 @@ static unsigned int re_string_context_at
- #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
- #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
- 
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
- 
- #ifndef _LIBC
- # if HAVE_ALLOCA
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
deleted file mode 100644
index b6da5a256ce2..000000000000
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl nls selinux static"
-
-RDEPEND="acl? ( virtual/acl )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_bootstrap_sed() {
-	# make sure system-sed works #40786
-	if ! type -p sed > /dev/null ; then
-		mkdir -p "${T}/bootstrap"
-		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
-		chmod a+rx "${T}/bootstrap/sed"
-		PATH="${T}/bootstrap:${PATH}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch
-
-	# don't use sed before bootstrap if we have to recover a broken host sed
-	src_bootstrap_sed
-	# this has to be after the bootstrap portion
-	sed -i \
-		-e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
-		doc/Makefile.in || die "sed html doc"
-}
-
-src_configure() {
-	local myconf=()
-	if use userland_GNU; then
-		myconf+=( --exec-prefix="${EPREFIX}" )
-	else
-		myconf+=( --program-prefix=g )
-	fi
-
-	# Should be able to drop this hack in next release. #333887
-	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
-	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
-	use static && append-ldflags -static
-	econf \
-		$(use_enable acl) \
-		$(use_enable nls) \
-		"${myconf[@]}"
-}
diff --git a/sys-apps/util-linux/util-linux-2.32-r4.ebuild b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
index fb5982c24623..8f905dcbd154 100644
--- a/sys-apps/util-linux/util-linux-2.32-r4.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a771e5b0a157..04fa80f007a4 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index 539abc70aefe..f90ae56bfda0 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,2 +1 @@
-DIST simple-mtpfs-0.1.tar.gz 116145 BLAKE2B 9a29b31ad754ed009653aa6b5516aca20827b85368fa537e0c6b8f8a9d56bac10cb26f12f0b599c54942466ddc293999428816646e7071ca8637dcade80011b9 SHA512 5c4b390c43ede521061c677b496d47376304a4625414853a2183a41cb4a2c67361ecd7e26d0b6197cc78e84d0a9c99ec92e85bd1c179784b5a7c06ae05ede308
 DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
deleted file mode 100644
index 2e98a9c8c77b..000000000000
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Simple MTP fuse filesystem driver"
-HOMEPAGE="https://github.com/phatina/simple-mtpfs"
-SRC_URI="mirror://github/phatina/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="media-libs/libmtp
-		>=sys-fs/fuse-2.8"
-
-DEPEND="virtual/pkgconfig
-		${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-AUTOTOOLS_AUTORECONF=1
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 5d03c096751d..bf4aa640ef07 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/python-typing/python-typing-0-r1.ebuild b/virtual/python-typing/python-typing-0-r1.ebuild
new file mode 100644
index 000000000000..c31dcbb43237
--- /dev/null
+++ b/virtual/python-typing/python-typing-0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for the Python typing module"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' \
+	'python2*' python3_4 pypy)"
diff --git a/virtual/python-typing/python-typing-0.ebuild b/virtual/python-typing/python-typing-0.ebuild
deleted file mode 100644
index 2f0fe66f6b2a..000000000000
--- a/virtual/python-typing/python-typing-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for the Python typing module"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' \
-	'python2*' python3_4 'pypy*')"
diff --git a/virtual/rust/rust-1.27.1.ebuild b/virtual/rust/rust-1.27.1.ebuild
new file mode 100644
index 000000000000..fa78c78a3e78
--- /dev/null
+++ b/virtual/rust/rust-1.27.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5de70c1c6173..de7a1b13b320 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index 7fddb0cd05da..9d92f0821556 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1 +1,2 @@
 DIST cgp-1.tar.gz 139265 BLAKE2B bf0f18def8ac3c2117b951172d4150f0626e8dcbe22accbcc6ad156e5f9f5c21792e38fa1bf5a964d8b50cbc7ee9003e4dcdcd75730ba2b0445f4dcfeffdda6c SHA512 fc5bc6d39dac896b56579cb6ca013c81493b994a7a190e0c0eec8a64f7b87c6eb2e0ad5cc969b8ea03ca4b00eee212ccee5c8785c23f5656bff3fe5490ff8f75
+DIST cgp-1_p20180620.tar.gz 139549 BLAKE2B 2cc1a416ae1158b5788615b05bf43039049af52eb5296e7fd8136c9895e8ee0a9887e84ad37c6598a4c4387982a2860fbdb7cf9cdff39cfe5bbee598b9ace88f SHA512 acd09bb699af678347dacfc08fee60a86843874543851805f245952e538777d7ccd528c156f7a21b803503c7aac134013a4eb8200d5266cf35541b0dce5839e4
diff --git a/www-apps/cgp/cgp-1_p20180620.ebuild b/www-apps/cgp/cgp-1_p20180620.ebuild
new file mode 100644
index 000000000000..6051624a6a90
--- /dev/null
+++ b/www-apps/cgp/cgp-1_p20180620.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN="${PN^^}"
+MY_PV="1920ca24a067ac157a6bd8f3c017f4c6244ae245"
+
+DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
+HOMEPAGE="https://github.com/pommi/CGP
+	https://pommi.nethuis.nl/category/cgp/"
+SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php[json]
+	net-analyzer/rrdtool[graph]
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
+
+src_install() {
+	webapp_src_preinst
+
+	einstalldocs
+
+	# Since the docs are already installed, remove them from htdocs
+	# The file doc/CHANGELOG is needed, as CGP reads from there it's version
+	rm -r .gitignore doc/LICENSE doc/nginx.conf || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "The command shell_exec must not be disabled"
+	einfo "through the disable_functions php.ini directive."
+	einfo "It must allow execution of the rrdtool program."
+	einfo ""
+	einfo "An configuration file for www-servers/nginx"
+	einfo "has been installed as an example."
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index c4bfe61698e6..e362d71e65a8 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,10 +1,15 @@
+DIST github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz 2112 BLAKE2B 3b3a6de509b7e9a2f925252a28a93e4d94e68f81e10b6a39bcb8066984ceff1e2d898c0f726b85a6984a396e88b382f5b7488c79a1d8bf6ddb7bf6eaae3d889d SHA512 b6eaa606660ab6fd2a952a8ef727c830db859658636ee7b214014f2b4a1ec3c671d85745f94ed118ed9d2cc9909a15d26c6be72baed5b6e13eccb5cfe20e58bd
 DIST github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz 42256 BLAKE2B 65fba0e39dbd7d9ffc5707379629ba9e8d91f186214afeb6b5f5960bd7d4b0f233247ecc1b23bff9c4ea8572f00b106ce5b833f88d975be5ffb29778fc18dcee SHA512 8a54f8b1f2fb9b5882d3c1498376c15aaf00eb8d9379090c38b03a6a291215923637dae9f36db1cca700687169cb08911e515222cd72fc153a5082ff4ddb5573
 DIST github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz 11651 BLAKE2B 5303cc2264bc289d94cbe81766e12ce42e5ab59a5fedf3bb9b1fba76d0ab543af8f7c34b991837f9ed6270003b5e1eb2d94721c27dc409ad67472c8dc0315d82 SHA512 faf9ef8e24db59d477073fb8a06de337827f21b84a69c03cf47c6ddd8d3d67772319e261d98fe1fafbcc80c725db52541e02f8f2d598986246d02b8e381b4e6a
 DIST github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
+DIST github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz 71099 BLAKE2B 2894bc0568c3d114aff71724dade89c604d9f0528cbe8f5c644c4a850941f146eec9a862886cb3241b75212c6f2272efc50a6923166eeb571be26c8aded40e0d SHA512 182f141d83bb9b1d7d94cf3b1beb2e7c4074f9be3bd0250e3423fe64e6182f34b54b36e517397aa88440e42fe116973ed435bde6b8343df299db6ebb32591331
 DIST github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz 301047 BLAKE2B 8d14d121cdeb160d3ed10d6b60a8d97897b0344c7c42e5a6546ef1996d32bc163ff650f0d74b9085635ac179fe14a672dff87fb4b3ae43093fd06ba660fc4faf SHA512 67f0d6f741fa07e9d6c3fdc92d0235ed70927b6fa85a346c8b7ecbf9b709e2b7810aaa8f625f5d528bb20d9f7118b4af1cb52fc7f4a5d3e7d1dbf05c0430d7ef
 DIST github.com-alecthomas-chroma-85c342e3e3d715ad780edd0ba8728161e99cce24.tar.gz 298009 BLAKE2B e2c8e9e72c06d389c43f4040d652b8de27e9480d3dec27f1b76cee14e657aa10196cf42f42bb4a19d2982198e8a566598104fa14328f06bb12916f382e8bff26 SHA512 38d5c391aa9ec4b8c24bd18ec7bb9bd1dab9eb968689ca91635b9964e62d1c0b74c6d102071e48e461440e3f30f201a63bc3a8eaa9e200521c77d35ef4d8c655
+DIST github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz 3483 BLAKE2B e4ecc9503cc8c6053adb66f87ddaf1e9fb66fa18060c07a0e26c1fd8fa1b143d48345ea73c399571f787b8104a7522672a945d885f5e24dcf0718a995d6567f0 SHA512 e428ba9fdc2fcf097ec9892241cbca65631924dfe66a08ec4131e7cfba24125145600f03b753b7bc4452b06f0c7380560d9165ebeb7dddb30d35db512c825796
+DIST github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz 4609 BLAKE2B 4407439779e981b39d1926437aa67a8922bad0eeed8858b0888c53ee819c8551367e8f74d6d04854ce57dc45a477060461ebb79b30be6b8f6880dbc94f5d53c2 SHA512 f07fda8ecd0c653dfd0024eee9e33851572ee21a6aaa196d453825bc28bb92b3c80c0dc0aad38ec4e2158e7f22d7aa1166e4ea7aead713fa834c686cb98dc02d
 DIST github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz 3494 BLAKE2B 3f8103b07b4d37c060d48739c6a6cfc9b585ea3fcf1b87aa9bfee44245b8f4067763567864903b488070a3ae43a30b7ed95dcaa12517d119af0c4bc6cf73303b SHA512 2636d6ef6cdb5334da0e6ca560e64e2e1880ed749b7abdbc6ac6f2eff125c7c40e4eda549273d68097789234dc7e4bba3cd5d07ea5147e9d28ee390c2fd0216d
 DIST github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz 4602 BLAKE2B 5bd1389e89f3d7b9c423d5a3dc2c40b374acd71c5f71a1032184464184cabd67e4885afd4aafe82b0f8c4733389ea639aa5e9d3a71b86285cd6579cf3803b35b SHA512 a46602ae2651d6b21442e797658553b5e4e5f6226a772152fe690aabc0670ec3aa5d65dd9fb7e6fbac98a31b0e854cb5838c998ab47114499d65351760c87ffb
+DIST github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz 5373 BLAKE2B 63e63a26ffdeef5d27f5b39111b8b9e966982f4da720c9ff28f0b58517635319ae4fb1b349fa754a0a0ca01d8c3299d13f746a6ee920203c2837c18d064f2acd SHA512 e8f358a5007a5378d37489011beb6e178cdc864f195434f89295b09ff68ee79409ce0a062d4a0dfa1910e4f33201f04031b5a021aac5f40ce154de1f4da2ef60
 DIST github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz 34326 BLAKE2B f8a163210623f8233f08b59ed62370640634d8c9a0354c972079efca4f15be3a3a0cd98b8e97145a8cf69a1a35fc28f4d801646c95b211c39773b8fd83007486 SHA512 07a4d649a7c6258fb4993b7a8dc7105ef649085612c9df2c72dc6b106ddedf7c0f9e7d3e729f01fe914bfb2ac4d8f225dbb04f96e7b56461ec8648f9c57f81e7
 DIST github.com-cpuguy83-go-md2man-20f5889cbdc3c73dbd2862796665e7c465ade7d1.tar.gz 79347 BLAKE2B 4880f879d89e6e2e0e8b54fac3a5208f2b31a876d5d4a8566cfd9e83cb88c4edd355f1195cf8caeedd68a9f9f19be66e974b153504a7c6c7e455b648b83926d8 SHA512 15cf9697ab6771cbcad5a529f1d3362cb811b58662f10e352bf16530e22dd3dbfd5837cc0b587b049db03e7f813b855dc9d886f461fd5df45552d9813c35a9e2
 DIST github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz 40238 BLAKE2B 857577fd1356fa1b6fd28f8a0c0cdcd1b29f6e9ad2fb8159d261071bab83ee791d6c457f1f2f0b3d36ffa2344940eeb7bd7f50bc79f84882de99497581585945 SHA512 b1ff0d3cb7c02aa9809b545226ec5b050e4883388272cd55606e285262014ebd6ca20c69a9d7b6e2cb395b8a688444a4b4e267f1adcab43ad1425b4ed2ed1de3
@@ -32,8 +37,10 @@ DIST github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz 32
 DIST github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz 8767393 BLAKE2B 520a0b581b3567fc95ddef4a44157cbb0e1cec13d94b0c4ac0a6af29ce61bfe703b0d0e6178900a782532d161ffe98f650a498879ee31e5f9ccab81e6ef03328 SHA512 6c22de2dc7820ea60ddc26faa3590ba9a52877f6e84edc6685fca59e8138eebbb96fb14de8a2ccaf7a1c9d524afdef456f8e14106c4b30eff48766f47be84d4f
 DIST github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz 28710 BLAKE2B d1f849b968e769f8ba3ec36a417bdd43eae79d4676b98092607330407c4ae79bb591822ea12cf7d4fc665c79e4018c52e6044ac1346afcdce9f7f1115142a23c SHA512 ba4d0cc293cd00f9f8c1971f0845fcf57d87507b60f2a4f4fb439baa34b47295f7b7da44c37dd447d8aab4a9b46901490999e8beced93f491c6a778dcedcb408
 DIST github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz 10753 BLAKE2B ee2f15434c7cb9352a4acc1060a0eca725c32d4c127a68e0e5cec9dba8ee251d47ba7dab3b58a15a10e3cb5d3d47bd7051b2c879bfc27141a1b4168158f34310 SHA512 7af6f08396ab5777fa7c233d0bfbfcebf149a08dd17bca63c70a2d17027602ef01160e74479e8ac1ee529840211b849de46674edd32eac384f07dc7dc1158acc
+DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
 DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
 DIST github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz 198941 BLAKE2B 31e691854ad8b4f697620d786027e29c8da6a63430033cf05892bb9846cd8202b9780037d31de7ac526db907b9a07b45ce09be814ed9106de2d266c94409333e SHA512 a027acbebd034e48be627d5a5aba1bef5becf702652595ca815aada5acc7a39d67dd05b1c23584a8d3a296bcfe267a507f9f1e690e7cc8f84b87ce462d0985cb
+DIST github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz 6461 BLAKE2B 6317479125515dcd18a7a5589bfccc44cd5bfb961da8004a4fbb336840fe22c2e8c765dffa587c41d75dec17b2c2e5ff324b95a9efad3326d9290280c4f60d16 SHA512 a818ebef810eccfdca70aecc1a19208fd6f1ee454fe3677249d43ff8a5a6d462f2b947a8fe5808cfc50f7387457e65581bb2ee45012e5e0df3cae541357d70d3
 DIST github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b
 DIST github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz 448097 BLAKE2B fc3d3963959f7a611bae7e6492f11fbbc3787de2b9302c2f739c754a9efa7215bf3c3edfa10f6a10bc504700ed5b4ffd29a8c427f6b0d998a23edc91eef388e6 SHA512 04b38117087f540a03f9da9070a16010d7ef4cb6c321c94df3d3dc95faf57dc3a44f5e36055ce0a6a1c3d924ba01d8bdee40b0c1b457e6f03c650f91663c91cb
 DIST github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz 39654 BLAKE2B 35dbb1e468596499721693cccc2aeb8bb9aaaa94c6001f708b43e405ed6aafa90a40f8782c88de89c15c69bfa9e90036b87a9422ef6d5352f6076ee56d75ae1f SHA512 c0d0048da1755e9ccf4607851eb16ac95568f55131e3017af886442ebacdd71226eb3db5854261c2b6b39985cd09d24d37329280c13a72aa286cefcdaa01cbcc
@@ -43,6 +50,7 @@ DIST github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.
 DIST github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz 75260 BLAKE2B 684fb920f0183b4fb6ef70a995f22efa6152fbd9bae5ffadb1ac67e97fef3f6b7ed7449c487f086a12a0e497a36ca050289a66ad3aa0105a5027800acb13dc12 SHA512 01b4ff8c392c2188c5d97a606fa74df132eb255df91a9b7a7a79416ddef23bf712526f771f6b5fb0713664714fa45961092e808dce68d733e9611118729b3918
 DIST github.com-russross-blackfriday-55d61fa8aa702f59229e6cff85793c22e580eaf5.tar.gz 75172 BLAKE2B 90aff15badfdcb12c444f5c45d596ecbf483c2d63548dc8a8fe73a36f19806146dc29bd65f908cde49dc10635ea4d2c7ef6bc109f7496f8db918f9db3a214a1c SHA512 b51935e194057e93bf976f48165dfd0cdc3b2e9f175078c19e12ef39d1698e3a24f7f14741633b8526c5b6f79f236232b2910331d1ad43dd1f214bac636f04f4
 DIST github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz 8787 BLAKE2B c8f9a9036996f23267f836e2ba223d63099620f368c8e3c50830b1b90d9f7ac8e681b96d66d49a14ffcb03b4acc3242171ceacba14693c3e0560dc0fe860edca SHA512 801e021148504b2bd96b8b1953cbab6d980febaa103fc1f7ee59a491eb151b6cecdd3bb4058ed471dbca0624f3cb92d439ae9b023ea81426506f5aa09f082936
+DIST github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz 41675 BLAKE2B 36459e76965e83a638d3cfe840eccae0c4d75215c9a2d87b770456671fff0d7a8d1aa26597391dba3f928af12414f5877219f78d18f8110f5287f47a02efe4d1 SHA512 680d572de0841900f6bd1938fc8c0ad6e2dcf21af493bc9ff81ebcb013a15d9439c00fc11048c5de5a5916f8bc3038fcebd80c8faf74161562f5e3d3f90b1e24
 DIST github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz 2057 BLAKE2B 511fd36413822251b5a0aa08d632ca1e1564e4f6f9b49172a571e373c05298e24cf4720dc7005821ce94ce338a066b32e9e6cb19b70b2b2a652da3e9c91b5748 SHA512 1d53a83a293157ea42d4e1c7a1eb30c87eaa32cdc88521ebcfa3f94fa4ddcf35d1b839a16ccd00043ee59c113596d5048f88e5cf5f9e6ce6003c9d8faf837ad0
 DIST github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz 45193 BLAKE2B 78dd065841571fee60c41a83af08a97478f8a47599eb4e451717a8460856fd20be7732761b8321514993b65477c92492e81eb69d2548bf2468b5e072b2d2d25d SHA512 c1e1e2af81d6474a0404c3d3152b1ba8b89e6f3f90234e2fe869ffad6003f44773ca9411d96e70c959ea8a5ac9d8ff8fb11360edda71eea2e4de96b815e06d51
 DIST github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz 45265 BLAKE2B 93c8cccaa4dea6f1a6a0b1ce2d326d1b4ea4cd1269c1ef6c74902c9713dfae73c5e24a8fdaf93a5f369d1706a92441c7504cdea325f75f1982476f6af401652b SHA512 94f0cbd5035b423f300fa82348a1b8ff52bfa7460b9adebe08b372c5a16c46b3ae9e3e3277b2b299c4da68b518a579dbaf512c1fac2198cdba8c1ebe7f00cd1c
@@ -54,6 +62,10 @@ DIST github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz 6750
 DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz 32062 BLAKE2B ca08f97574d71f3e305ec52dc440c2293c23cedcff63f8297ba9352283375059700998b4f198b76e6903f6b8e1c32744b0c335d382bfc232f1038d527341c043 SHA512 fdf9358afc0bf3bc150d1340b65a9758b2c58d871cacb9e924a9501bca5980c86102eea6746ef5bce972bc3685759dbe5eadc8e82d8ccd6ccf56f73230686e63
 DIST github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz 95392 BLAKE2B 7e6d970b409e3cc62ba24c5a8d132a7a871b66af4a287a217b40f19ea17b12ef680ff6ebd59c708acd5139f673b9ca8faef7e04c719939cbbd0e331f63eb22af SHA512 9924e8fce7ddfce9541f7da1dfec5a5f57a4d54261f3b16e4bd541a8fe4cb90d2900de24c6e9ae791df9264a27624d23c8b7a4d19a9974e2e2c83c68a0dd484a
+DIST github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz 2108798 BLAKE2B 0ccef101e941c6f57b9bd1e461ddeae5d15864e17ab686768d7b09680dda4c08068b31dff14e5d9ca57fdd38c465e5fda6007fe74e3826617ba75a055bee3721 SHA512 3e8c4b716885e25b5c171730031e1b63ea94a73f89290ea1fa2f38dd5eb7945e4320fd269147739403d19b69076ff693e422b4400a200381cc3017916b384b24
+DIST github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz 73581 BLAKE2B 20c061130798049e5f45bd0176e03fd5de9e9af141431ad475a74f8c788cd359f07ab33e10562e85d1b3eed7d98619f3b0c08427ad9486550ee9cb355c7b0721 SHA512 983f2239b394c67b0b4881632eb7885ce0a54788134619b07398778853bb2e0520049be45985976b16436beac1c69868b523cd73919339cf30acc81f2f1f8b40
+DIST github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz 333495 BLAKE2B 3f2e909feb68f0f673ef378890548dad3585fddb9e40bcc8b97418123a268ec875e0ffcd50b5fd83b4dac68431f24a2be471d416624c165b15bf64f2f7843821 SHA512 a3413cb8b861eb2f05ba01c6735722b68dbaec5d8a646faa7d6175de9c8831d7409e602f72e64fa305fb3f49056a237ce8219c24d149b5e27dc60e5d94a87ee5
 DIST github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz 23279 BLAKE2B 227141f6cc7b950392ecbbe97f8b889f20e14544b7c80a0986c68dc997956db18d96297cb6e1a49a89fe851f76184f0eac446d2e0fe1c93d45526a9ee26102f8 SHA512 1220a31b92b1e0f76e1e04e7161ee977fd4e17374437ee807ae943a2970df7fb4551f68f4d2175db8f6d7b37d52b564dee75e6f1e84e8fd5939572c3b64bd87d
 DIST hugo-0.40.3.tar.gz 15168823 BLAKE2B d3e057c6e2da074813691b01e1965fb44b4ae5ca9882fe58d67ba897f628ca2810317eef7ab0c6437ae48ea1136554995f97d8e4e581e26201d61515c9de85ae SHA512 903911fb268b79c9981020b1f7b24a34bfd608f89feb902d45050870f442587349bf029df95b95196bf3e777ff5ade2b372cdb899ec1020fa8ae0fd621b644d3
 DIST hugo-0.42.1.tar.gz 16529961 BLAKE2B b9b16de707a1d9a17a42147451ce365453a927b772a3eb3f40c835a7d14b55e707cd9e312e8ce8d6f4805a691fba3c967d1e4c01fca2487731efb30d5da4ea0d SHA512 bf3cfe09adfd736cd2c25da1dabfedaa8e262a46d6ba8fc8253b5a4ab1204d82c1fd3337be00ec85f530d54e3a6e23078aee93b379e1a00bceb952c637a1603a
+DIST hugo-0.44.tar.gz 17634657 BLAKE2B 6f21af5003b6a082df3cc3a64a6013c78f7c9fc5f81d56c1925d8ee3092f3381129599e008c1c9ca752cb6b40f405a6893664bee508cf55c700f59e5a9461ce5 SHA512 0cfd399a18e21c0596095c8e6817cf953b142624a1661e0e95944fccd74ca8e93072694e6a340300fbc93a739e744276893f42fafa44983beb5f6e5b60437cfe
diff --git a/www-apps/hugo/hugo-0.44.ebuild b/www-apps/hugo/hugo-0.44.ebuild
new file mode 100644
index 000000000000..3860c9f640a4
--- /dev/null
+++ b/www-apps/hugo/hugo-0.44.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_VENDOR=(
+	"github.com/BurntSushi/locker a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
+	"github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895"
+	"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
+	"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
+	"github.com/alecthomas/assert 405dbfeb8e38effee6e723317226e93fff912d06"
+	"github.com/alecthomas/chroma 1b755a90bd109f170385cb3964f0abdfd3451145"
+	"github.com/alecthomas/colour 60882d9e27213e8552dcff6328914fe4c2b44bc9"
+	"github.com/alecthomas/repr f49988b46e025398b9f834f7c726afe001ec481f"
+	"github.com/bep/debounce 844797fa1dd9ba969d71b62797ff19d1e49d4eac"
+	"github.com/bep/gitmap 012701e8669671499fc43e9792335a1dcbfe2afb"
+	"github.com/bep/go-tocss 2abb118dc8688b6c7df44e12f4152c2bded9b19c"
+	"github.com/chaseadamsio/goorgeous dcf1ef873b8987bf12596fe6951c48347986eb2f"
+	"github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"
+	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+	"github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76"
+	"github.com/disintegration/imaging dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
+	"github.com/dlclark/regexp2 487489b64fb796de2e55f4e8a4ad1e145f80e957"
+	"github.com/eknkc/amber cdade1c073850f4ffc70a829e31235ea6892853b"
+	"github.com/fortytw2/leaktest a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
+	"github.com/fsnotify/fsnotify 629574ca2a5df945712d3079857300b5e4da0236"
+	"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+	"github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
+	"github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
+	"github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+	"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jdkato/prose 20d3663d4bc9dd10d75abcde9d92e04b4861c674"
+	"github.com/kyokomi/emoji 7e06b236c489543f53868841f188a294e3383eab"
+	"github.com/magefile/mage 2f974307b636f59c13b88704cf350a4772fef271"
+	"github.com/magiconair/properties c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
+	"github.com/markbates/inflect a12c3aec81a6a938bf584a4bac567afed9256586"
+	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
+	"github.com/miekg/mmark fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
+	"github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b"
+	"github.com/mitchellh/mapstructure 00c29f56e2386353d58c599509e8dc3801b0d716"
+	"github.com/muesli/smartcrop f6ebaa786a12a0fdb2d7c6dee72808e68c296464"
+	"github.com/nicksnyder/go-i18n 0dc1626d56435e9d605a29875701721c54bc9bbd"
+	"github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
+	"github.com/pelletier/go-toml acdc4509485b587f5e675510c4f2c63e90ff68a8"
+	"github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2"
+	"github.com/russross/blackfriday 11635eb403ff09dbc3a6b5a007ab5ab09151c229"
+	"github.com/sanity-io/litter ae543b7ba8fd6af63e4976198f146e1348ae53c1"
+	"github.com/sergi/go-diff 1744e2970ca51c86172c8190fadad617561ed6e7"
+	"github.com/shurcooL/sanitized_anchor_name 86672fcb3f950f35f2e675df2240550f2a50762f"
+	"github.com/spf13/afero 787d034dfe70e44075ccc060d346146ef53270ad"
+	"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
+	"github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+	"github.com/spf13/fsync 12a01e648f05a938100a26858d2d59a120307a18"
+	"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+	"github.com/spf13/nitro 24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"
+	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+	"github.com/spf13/viper b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
+	"github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71"
+	"github.com/tdewolff/minify 8d72a4127ae33b755e95bffede9b92e396267ce2"
+	"github.com/tdewolff/parse d739d6fccb0971177e06352fea02d3552625efb1"
+	"github.com/wellington/go-libsass 615eaa47ef794d037c1906a0eb7bf85375a5decf"
+	"github.com/yosssi/ace ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
+	"golang.org/x/image f315e440302883054d0c2bd85486878cb4f8572c github.com/golang/image"
+	"golang.org/x/net 61147c48b25b599e5b561d2e9c4f3e1ef489ca41 github.com/golang/net"
+	"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+	"golang.org/x/sys 3b87a42e500a6dc65dae1a55d0b641295971163e github.com/golang/sys"
+	"golang.org/x/text 2cb43934f0eece38629746959acc633cba083fe4 github.com/golang/text"
+	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" )
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="github.com/gohugoio/hugo"
+GIT_COMMIT="4172a835e544b867f292579019d0597439e596ba"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Fast and Flexible Static Site Generator built with love in Go"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="sass"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" $(usex sass "-tags extended" "") || die
+	popd || die
+	bin/hugo gen man || die
+	bin/hugo gen autocomplete --completionfile hugo || die
+}
+
+src_install() {
+	dobin bin/*
+	dobashcomp hugo || die
+	doman man/*
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index 97df2a00971b..dc988c842339 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<use>
+		<flag name="sass">Enable SASS/SCSS support</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index ca5c14cf1a95..e2f5795a3719 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,2 +1,3 @@
+DIST phpsysinfo-3.2.10.tar.gz 1021435 BLAKE2B b9db266021c0392902d6de58492165a889151716484d23f99648e8322c7e76edfda17e8a7b8f415fcc42d5970a98603ea84571989c1168e10e8d87ee3a2f6927 SHA512 56954e64e6c267c2a60baaf91a9a218d2c81d99dc4f159e35d752328bdd38135eb4e9d91d09798b3822cdbf0d04a6169a46385c2d02a812b136fe115b7310a88
 DIST phpsysinfo-3.2.2.tar.gz 899974 BLAKE2B 4da569d90a4ee383535a5a155c754a40f104453d504148729fcde03a4ee6839e914dc0375115d392c81225a451a35e3009218c20019abf0661ba629c98377952 SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9
 DIST phpsysinfo-3.2.3.tar.gz 909045 BLAKE2B dc1f9d9f7cd83b60eb16f073607f5c7a5f5ad155b297d4defc9b1768c771cd12bd315af3e67f4c7a5f731ef66b8e9eb00da4083074f9cb3908ebbce9198a568c SHA512 33a77d96f3f9ac4e59a078e3106af656f68ec048aa7b89409915373cb4174fff7f709a3a3984cdba2990d397fd019930ae7f24b8fe5484061f3a89dc9f023eaa
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 15b8d1f6508f..f8482ac659c0 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -1,10 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
+	<use>
+		<flag name="apcupsd">Install <pkg>sys-power/apcupsd</pkg> to display those stats.</flag>
+		<flag name="dmraid">Install <pkg>sys-fs/dmraid</pkg> to display those stats.</flag>
+		<flag name="freeipmi">Install <pkg>sys-libs/freeipmi</pkg> to display those stats.</flag>
+		<flag name="hddtemp">Install <pkg>app-admin/hddtemp</pkg> to display those stats.</flag>
+		<flag name="ipmitool">Install <pkg>sys-apps/ipmitool</pkg> to display those stats.</flag>
+		<flag name="ipmiutil">Install <pkg>sys-apps/ipmiutil</pkg> to display those stats.</flag>
+		<flag name="iptables">Install <pkg>net-firewall/iptables</pkg> to display those stats.</flag>
+		<flag name="lm_sensors">Install <pkg>sys-apps/lm_sensors</pkg> to display those stats.</flag>
+		<flag name="mdadm">Install <pkg>sys-fs/mdadm</pkg> to display those stats.</flag>
+		<flag name="megactl">Install <pkg>sys-block/megactl</pkg> to display those stats.</flag>
+		<flag name="nut">Install <pkg>sys-power/nut</pkg> to display those stats.</flag>
+		<flag name="quota">Install <pkg>sys-fs/quota</pkg> to display those stats.</flag>
+		<flag name="smart">Install <pkg>sys-apps/smartmontools</pkg> to display those stats.</flag>
+		<flag name="snmp">Install <pkg>net-analyzer/net-snmp</pkg> to display those stats.</flag>
+		<flag name="uptime">Install <pkg>app-misc/uptimed</pkg> to display those stats.</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">rk4an/phpsysinfo</remote-id>
 	</upstream>
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
new file mode 100644
index 000000000000..9cc1c23ec996
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="A customizable PHP script that displays information about your system nicely"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="apcupsd dmraid freeipmi hddtemp ipmitool ipmiutil iptables lm_sensors mdadm megactl nut quota smart snmp uptime"
+RDEPEND="dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+	virtual/httpd-php
+	apcupsd? ( sys-power/apcupsd )
+	dmraid? ( sys-fs/dmraid )
+	freeipmi? ( sys-libs/freeipmi )
+	hddtemp? ( app-admin/hddtemp )
+	ipmitool? ( sys-apps/ipmitool )
+	ipmiutil? ( sys-apps/ipmiutil )
+	iptables? ( net-firewall/iptables )
+	lm_sensors? ( sys-apps/lm_sensors )
+	mdadm? ( sys-fs/mdadm )
+	megactl? ( sys-block/megactl )
+	nut? ( sys-power/nut )
+	quota? ( sys-fs/quota )
+	smart? ( sys-apps/smartmontools )
+	snmp? ( net-analyzer/net-snmp )
+	uptime? ( app-misc/uptimed )"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	newins phpsysinfo.ini{.new,}
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e72a624f51fe..2065b349ba25 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/firefox-61.0-r1.ebuild b/www-client/firefox/firefox-61.0-r1.ebuild
index fc312e57d18f..1d65fc4e1f81 100644
--- a/www-client/firefox/firefox-61.0-r1.ebuild
+++ b/www-client/firefox/firefox-61.0-r1.ebuild
@@ -224,6 +224,7 @@ src_configure() {
 	# Default mozilla_five_home, system-hunspell no longer valid option
 	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
 	sed '/enable-system-hunspell/d' -i "${S}"/.mozconfig
+	sed '/disable-stylo/d' -i "${S}"/.mozconfig
 
 	# Finalize and report settings
 	mozconfig_final
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4ba5f4f70eaa..22e984d2ddcd 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
index 4260d05bc29e..c269c6f6ad71 100644
--- a/x11-misc/compton/metadata.xml
+++ b/x11-misc/compton/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
-    <flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">chjj/compton</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<use>
+		<flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
+		<flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">chjj/compton</remote-id>
+	</upstream>
 </pkgmetadata>