gentoo resync : 14.07.2018

22 files changed, 725 insertions, 275 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b0befded0ae9..0ee41ec8311d 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 317d8ba502c9..dc7d04f3414e 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -24,6 +24,8 @@ AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a0
 AUX ceph-12.2.4-boost-sonames.patch 5145 BLAKE2B 70609fbcf98c556bc681a27da37abaf0178f0d60850f3d5dd7806f71dcc21affd103bbc4ffcd21be7ebe6a82a04eab5a46548aeb1d18ad398860e14f50b86ec6 SHA512 d8a69c34c02848ba918bf65f318bb02f27cbbbd618a337cc21153cad4ab33a07dfef27d8cfb1d2839b145a245483c57dfdbddb87061a5f9ce215fb6df94ef591
 AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e
 AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48
+AUX ceph-12.2.5-boost-sonames.patch 5546 BLAKE2B 8062f550dd36371b1f89981ed2c63e5d8ff4273a6843f8cb8227c38fcfe29c1ce42c07578c3491a9b04e548d0c76a27481a7cb9ae2afad2870191090697c6f4b SHA512 0f48e5107be166306c832bc998c4375759e783ce0159250b3440f22ed7ef3b16fefc9e2258b53829145361d2e2e6bae97e09dde6ed81149a137f3ce84fe4ee47
+AUX ceph-12.2.5-no-werror.patch 2214 BLAKE2B b8878f8dd9e971f0f11f0954ba81fdf2df270e0ac3588220f629255737119a05def4012caa202b2e13f693b3962322126d7b6fb91ca18e844b0a1aed3de37586 SHA512 db945087453b83a87c963bf87b35ab77946a53f3b86e24dafd4b947e098d9780ff41aa6df979adcd306fa9e740d1dbba8cf7c391feb5b934ea83c55621b350cd
 AUX ceph-13.2.0-boost-sonames.patch 6598 BLAKE2B 906530f288518b26b005140645241da4deda6ab38a1780fdd92e9a7602547cc8f6ef65da66a2fe689d047339aa1237a32ea524419649109309634b8516ce687b SHA512 4d62c4babfcd20fadbe25572d3aebb4b01360a22fa5554e73454d59d9a46ed011b59ab0538e0ddd182c006889c160394d8eda171171aeb55c131ce7237c54343
 AUX ceph-13.2.0-cflags.patch 1011 BLAKE2B a7d911ed0ded1a1eb5426bae3a7b1cc169774668cdefd120ce8a5bb2f2082d792dfa0d2e14bac558bf27343763b66d42b9d84046acfa5a1cb1d61fc1219955b3 SHA512 8ec0d668fefee12d2c7f5b5297dd81fc6a559f5823d069e6395d9b4240110eb8f95049d3054697a459948c1f3784b4450539849cf9d7f3b1aa1c7fbd96c475df
 AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df501f1c31eaf6a9ca7d46164e84a37aec7e99ac12456bd299604d18b2f0ac70898de90427a80390644a8e3d455c5e3caf297854 SHA512 aa0f3dab73573c1ac91513bca378a8441ace5f58a0e469f4f01d7ab22869b41e5d4a1e44c3fe8e2bc23ab5249fd1a52a4b72000d458521b6ee291512e51d474c
@@ -55,6 +57,7 @@ DIST ceph-12.2.1.tar.gz 148738778 BLAKE2B df4bea1ad552ab2361174c1e2f285f42b4a07a
 DIST ceph-12.2.2.tar.gz 148763718 BLAKE2B 5c9a56bc536b723ca3a6a0aa68c7f456032c892716167dfa213cda4964e3a45e970efe6dd67e5c43ef6f6018bd9367e0c890de270acccf3217b848b58cb98488 SHA512 89b166dc4b58e0110ebe0147eef9f47e1090ccee01702b3f72cfbdca856d02bf03b2663de9e88c84b21a2a61f8f92211e217a05b8bdcf7d5de3158adbe49db88
 DIST ceph-12.2.4.tar.gz 78694838 BLAKE2B 862c275eb5e42065b2f42d417f8efd2ee8ee67c19575eb19bc799d5923d0720fa4810e1c51915fee6f96a44d433059ca6b180861013b735287751ad24235e611 SHA512 ce9ec49e8693d11345adb3a219763cc76b626db2c26d8d9ba08ff0a4d6fdeb08739da29bb87ff0946fed8e6fd55c8db0672cb286f7ebb90cf2e11a47042ba5d6
 DIST ceph-12.2.5.tar.gz 78758920 BLAKE2B 0e4a515ff80fdd39e8f1afd737434c7dc2a218f0a89b53ec31bc3a5478bfd876c6f2bf3c2947a8c2f056d9b94ffa34d18ceac06b00008605e84485ec631c7a32 SHA512 bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86
+DIST ceph-12.2.6.tar.gz 77212021 BLAKE2B ad61ab226a9007fc4ddbbddccde3572c6e6a2a8070aeb26cbf1ec8a64e8e292e703c13fc40f1921ef9a4bf2330300dd2f9bdf4cc3ebd70550b6b690bbe8c58b5 SHA512 7512623a9bf64b5da1989f62a6c5a3761ae21773bdac185f36a4dcd470f6489724807f28e98e9861ff34f86d2b0ce7af00eac2ddbaa5bba43b49786cb65ad7ff
 DIST ceph-13.2.0-frontend-node-modules.tar.xz 44082360 BLAKE2B 0f1bcf1c5154bdc352c9314853099b314b76c76cf1c3ee2447803ea5d79d02bbc91a0f8aefa6df96b47fc2d89e531354ac485752d2dbb762498d3eaba273635a SHA512 ad3c38b055ba886215aea07c4afb202cc3bfb64cdebc816eb4f124f76f2401e04e5645859b2a780828bf8eddcc0093b36d4d9935b703ac2bbc4212e913abeb8c
 DIST ceph-13.2.0.tar.gz 89077825 BLAKE2B 07ee531a672e436df8f218ecb4a2425d33911771dcf9c63fa9fc36a868c93a101029d8a8c69fcea026882ac466e6032da76be0dc961ceb03845b955fb5762add SHA512 2524ad5a868024463e1a1edc5bd9c3f7bc1f58e47bf8d331902ed53206120abc6a427dd9c1d657131e67efd955d6ed8052b6c3fed8658aa905d58ac58ee62973
 EBUILD ceph-10.2.10-r1.ebuild 7632 BLAKE2B dbd9ddb6dc6c196af4553c24bd0beb33e409334d72fb5838c98343bf7b3d807f657aac1586fa156edf8c5378c69cd1b072fdac03cdee0d9b4154e97d0ddbc647 SHA512 94dea0f2b98fda249641d6f60d673dbf9793ee4205ff0b10267604c0022ceef8640eab54be3c39afd84a07bd0a29b2a667d140a4010bb3d8c5c0134dfb4a9eb7
@@ -69,6 +72,7 @@ EBUILD ceph-12.2.1.ebuild 7338 BLAKE2B cd4cccedaeb34e9057da645ba7640e1577b593dda
 EBUILD ceph-12.2.2-r1.ebuild 7315 BLAKE2B 4ea06a4679902338bcfc631f16c3d3fe60efa59baee88d06579fbc54b4ffe12ac6b003551edbbd18f1ee3c42814c64f4efa948dec2a2881231620b2f0a5acc91 SHA512 806d2a6ce722da06e6430bc4e7b6091e858333b84631690d3b6702c0c158618a09368ec352b563c437ce8253cdf38a487011b6601ee78ce4adfe148191c303f4
 EBUILD ceph-12.2.2.ebuild 7315 BLAKE2B dee5111ca1f52b26f49f27384bbff20d339ab9dd9ad4eba77709f2f9af59c42480f1d55324e8691b9b86b7ee2615a68c473d2d389355c7d57fc2b2b19672f980 SHA512 af0421ed063be53baa3daef7a8ec0b9c7bfdf66180afa483ed3459a664fce463b4de65a23869577f616ff4149a40e8223ed27de792bbb2a9b001bf9baaed39ab
 EBUILD ceph-12.2.4-r2.ebuild 7823 BLAKE2B 5f79161d66f36efab2282d6d40ed9982921cdc647584aef23a049083c42be27a016322ffb0fb4480b8c6993d5242760d4502fa29a5e23c0aa575863e8c6a1ced SHA512 57e8cb259190716954a2e5603fc9fdaced2abfdf93f12ae744e0beb6f0d311f0b51a715a60e335b4f14d40062fdd7147bb21975de016ae23ea7878f023d70b9b
-EBUILD ceph-12.2.5.ebuild 7845 BLAKE2B c9719913a9c4d362871131f2a302231c6705ffa0770e4a8668d48fbc8f5aea357fb895a53a2114dea2f4027b4bd9d64364485a427e3b0f95ca5b1900f79106b3 SHA512 a5c958a257d7764f2d0e3d2ebabfb65b3027726c5a4f8976464f9cf13190a5ca161057dae43746c8aac43c7df1f5828b2aad1f2c2ca88d8a3a2103298d9096e2
-EBUILD ceph-13.2.0.ebuild 9379 BLAKE2B 49969daeb122519f4c20cf33123e67925ae32a4532cb9a59d0881779986e8e07389335d100c1f256f5760f9674fa94eb95fc0f33e02d08b02cfb0f528db8ddcd SHA512 39f9a42d3cb820a957839b271b4b6b88f40095ca3c6bd444921583909f1ba50abbccf8d1a04da61282da37bf288a2d4da109e54c60e607c1b3f54f794c2b9ed6
+EBUILD ceph-12.2.5.ebuild 7886 BLAKE2B ce57a94c7a55e88ecc8729fc3a46433854d65d222561b418416b3aab52c689cca2487304b4925a070834e75e3bf82d82dded2207683d4374fd7314d8fe0aeb36 SHA512 69b46ff16141c2efeb0e650b3f0f48905608f33ca8316a6b394262cfb12d54b65ec07a5805053aae71533f5eb62314d5435f25a835635b7d3fc13666865d0615
+EBUILD ceph-12.2.6.ebuild 7888 BLAKE2B 6234f761f69dca588bf797c822d8d44b6c52db8cf5f5cc4448c4404c6dc14f1908b864aadbe4bae9f751d98dc20b69aa4217b69ea21c3c4358e194d093cec547 SHA512 f0a7a534d40e0868aa2a0c1700738136d56eaa59fedf7ab765bc1ea1993d6a973cf4c8c08644693bc4115afd84ba9fa86eb13d66e45e613edacec1877a6b09aa
+EBUILD ceph-13.2.0.ebuild 9378 BLAKE2B b891cb92b54974ece68422dacd347ddebfa89a3e0513b9dac6b25d0f779041f220c007b206d96d0a1e9d2e99f09016776ee494019d8e6de4164fc7ddd11bf1de SHA512 dcd41abd5722e2bd27137cb4e900300e14cf6e5fa8ef0e33b1e61e1b176ba2df401eb54efbb90ae20848752228f92e29cd72bb124527cb441e0e87ec531c037a
 MISC metadata.xml 1773 BLAKE2B e6fa9ca15441688a4072db66e4e02ca9afcad1c0da4ac06e581a84815b09d8e0793e39f10840cb6950f811cf679ed3322a8b234d3a4a9ac1f0e58aa0927d1447 SHA512 8a74d9f391e32c7d13f12b7234a7e4b36f81acb67764fe7d6c53217723e2fa98ea918edf4b3c908595974c82353def83a3ff236bcdaac5a6f2234b14ea17ca9a
diff --git a/sys-cluster/ceph/ceph-12.2.5.ebuild b/sys-cluster/ceph/ceph-12.2.5.ebuild
index c7805109ba2c..75cd704ac78f 100644
--- a/sys-cluster/ceph/ceph-12.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -128,6 +128,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
 	"${FILESDIR}/ceph-12.2.4-cflags.patch"
 	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
 )
 
 check-reqs_export_vars() {
@@ -163,7 +164,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.4-boost-sonames.patch"
+		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
 	fi
 
 	# remove tests that need root access
diff --git a/sys-cluster/ceph/ceph-12.2.6.ebuild b/sys-cluster/ceph/ceph-12.2.6.ebuild
new file mode 100644
index 000000000000..000712b8e6fc
--- /dev/null
+++ b/sys-cluster/ceph/ceph-12.2.6.ebuild
@@ -0,0 +1,305 @@
+# 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}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
+	python-r1 udev user readme.gentoo-r1 systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	<dev-libs/crypto++-7.0:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	nss? ( dev-libs/nss:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	ssl? ( dev-libs/openssl:=[static-libs?] )
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		dev-libs/openssl:=[static-libs?]
+		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+	)
+	system-boost? (
+		>=dev-libs/boost-1.66:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	test? (
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2
+	!<sys-apps/openrc-0.26.3
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	${PYTHON_REQUIRED_USE}
+	?? ( ssl nss )
+	?? ( jemalloc tcmalloc )
+	"
+
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-12.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-12.2.4-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
+)
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python2*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_NSS=$(usex nss)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+
+	ceph_src_configure
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make all
+
+	# we have to do this here to prevent from building everything multiple times
+	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${D}" emake install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python2*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/ceph-13.2.0.ebuild b/sys-cluster/ceph/ceph-13.2.0.ebuild
index 41559adb2006..113df40b6e0a 100644
--- a/sys-cluster/ceph/ceph-13.2.0.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.0.ebuild
@@ -17,7 +17,7 @@ else
 		mgr-frontend? ( mirror://gentoo/${P}-frontend-node-modules.tar.xz )"
 	# unkeyworded for testing that this actually works
 	# had to do a lot of hackery for the mgr frontend, dunno if anything broke
-	#KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
new file mode 100644
index 000000000000..57482b3f27c4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch
@@ -0,0 +1,165 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa90ba65da..ea65dd4209 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS
+ set(BOOST_HEADER_COMPONENTS container)
+ 
+ if(WITH_MGR)
+-	list(APPEND BOOST_COMPONENTS python)
++	list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
+ endif()
+ if(WITH_BOOST_CONTEXT)
+   list(APPEND BOOST_COMPONENTS context coroutine)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7aa8a4392e..111f669f2e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -622,13 +622,13 @@ set(ceph_common_objs
+   $<TARGET_OBJECTS:crush_objs>)
+ set(ceph_common_deps
+   json_spirit erasure_code rt ${LIB_RESOLV}
+-  Boost::thread
+-  Boost::system
+-  Boost::regex
+-  Boost::random
+-  Boost::program_options
+-  Boost::date_time
+-  Boost::iostreams
++  boost_thread
++  boost_system
++  boost_regex
++  boost_random
++  boost_program_options
++  boost_date_time
++  boost_iostreams
+   ${BLKID_LIBRARIES}
+   ${Backtrace_LIBRARIES}
+   ${BLKIN_LIBRARIES}
+@@ -712,7 +712,7 @@ if (WITH_MGR)
+                  $<TARGET_OBJECTS:heap_profiler_objs>)
+   target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
+   target_link_libraries(ceph-mgr osdc client global-static common
+-      Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
++	  boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+   install(TARGETS ceph-mgr DESTINATION bin)
+ endif (WITH_MGR)
+ 
+@@ -885,7 +885,7 @@ set(ceph_mds_srcs
+   ceph_mds.cc)
+ add_executable(ceph-mds ${ceph_mds_srcs})
+ target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
+-  Boost::thread)
++  boost_thread)
+ install(TARGETS ceph-mds DESTINATION bin)
+ 
+ add_subdirectory(erasure-code)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index f3999e3b01..0ce7fca1ba 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
+   )
+ target_link_libraries(ceph_omapbench
+   librados
+-  Boost::program_options
++  boost_program_options
+   global
+   ${BLKID_LIBRARIES}
+   ${CMAKE_DL_LIBS}
+@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
+     cls_rgw_client
+     cls_user_client
+     cls_lock_client
+-    Boost::regex
++    boost_regex
+     ${BLKID_LIBRARIES}
+     ${CURL_LIBRARIES}
+     ${EXPAT_LIBRARIES}
+@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
+     cls_rgw_client
+     cls_user_client
+     cls_lock_client
+-    Boost::regex
++    boost_regex
+     ${BLKID_LIBRARIES}
+     ${CURL_LIBRARIES}
+     ${EXPAT_LIBRARIES}
+diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
+index 9fba701e05..da3cbcfe96 100644
+--- a/src/test/bench/CMakeLists.txt
++++ b/src/test/bench/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(smalliobench_srcs
+ add_executable(ceph_smalliobench
+   ${smalliobench_srcs}
+   )
+-target_link_libraries(ceph_smalliobench librados Boost::program_options global
++target_link_libraries(ceph_smalliobench librados boost_program_options global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+ 
+ # ceph_smalliobenchrbd
+@@ -27,7 +27,7 @@ if(WITH_RBD)
+     librados
+     os
+     global
+-    Boost::program_options
++    boost_program_options
+     ${BLKID_LIBRARIES}
+     ${CMAKE_DL_LIBS}
+     )
+@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
+ add_executable(ceph_smalliobenchfs
+   ${ceph_smalliobenchfs_srcs}
+   )
+-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
++target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+ 
+ # ceph_smalliobenchdumb
+@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
+ add_executable(ceph_smalliobenchdumb
+   ${smalliobenchdumb_srcs}
+   )
+-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
++target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+ 
+ # ceph_tpbench
+@@ -73,7 +73,7 @@ set(tpbench_srcs
+ add_executable(ceph_tpbench
+   ${tpbench_srcs}
+   )
+-target_link_libraries(ceph_tpbench librados Boost::program_options global
++target_link_libraries(ceph_tpbench librados boost_program_options global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+ 
+ install(TARGETS
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index 9f72fa3b48..665c977606 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
+ install(TARGETS ceph_radosacl DESTINATION bin)
+ 
+ add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
+-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
++target_link_libraries(ceph-osdomap-tool os global boost_program_options)
+ install(TARGETS ceph-osdomap-tool DESTINATION bin)
+ 
+ add_executable(ceph-monstore-tool
+   ceph_monstore_tool.cc
+   ../mgr/mgr_commands.cc)
+-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
++target_link_libraries(ceph-monstore-tool os global boost_program_options)
+ install(TARGETS ceph-monstore-tool DESTINATION bin)
+ install(PROGRAMS
+   ceph-monstore-update-crush.sh
+@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
+   ceph_objectstore_tool.cc
+   rebuild_mondb.cc
+   RadosDump.cc)
+-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
+ if(WITH_FUSE)
+   target_link_libraries(ceph-objectstore-tool fuse)
+ endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
new file mode 100644
index 000000000000..dd24e7819fe0
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
@@ -0,0 +1,55 @@
+diff -ur ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt ceph-12.2.5/src/rapidjson/CMakeLists.txt
+--- ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt	2018-07-09 11:18:09.188115751 -0700
++++ ceph-12.2.5/src/rapidjson/CMakeLists.txt	2018-07-09 11:36:56.848639110 -0700
+@@ -50,7 +50,7 @@
+ endif(CCACHE_FOUND)
+ 
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
+     if (RAPIDJSON_BUILD_CXX11)
+         if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
+             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+@@ -73,7 +73,7 @@
+         endif()
+     endif()
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers")
+     if (RAPIDJSON_BUILD_CXX11)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+     endif()
+diff -ur ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt ceph-12.2.5/src/rocksdb/CMakeLists.txt
+--- ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt	2018-07-09 11:18:09.219115543 -0700
++++ ceph-12.2.5/src/rocksdb/CMakeLists.txt	2018-07-09 11:34:58.843411195 -0700
+@@ -174,15 +174,6 @@
+   PROPERTIES COMPILE_FLAGS "-msse4.2")
+ endif()
+ 
+-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
+-if(FAIL_ON_WARNINGS)
+-  if(MSVC)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+-  else() # assume GCC
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-  endif()
+-endif()
+-
+ option(WITH_ASAN "build with ASAN" OFF)
+ if(WITH_ASAN)
+   add_definitions(-DROCKSDB_TSAN_RUN)
+diff -ur ceph-12.2.5.orig/src/rocksdb/Makefile ceph-12.2.5/src/rocksdb/Makefile
+--- ceph-12.2.5.orig/src/rocksdb/Makefile	2018-03-11 18:58:51.000000000 -0700
++++ ceph-12.2.5/src/rocksdb/Makefile	2018-07-09 11:35:53.847049123 -0700
+@@ -243,11 +243,6 @@
+ WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
+   -Wno-unused-parameter
+ 
+-ifndef DISABLE_WARNING_AS_ERROR
+-	WARNING_FLAGS += -Werror
+-endif
+-
+-
+ ifdef LUA_PATH
+ 
+ ifndef LUA_INCLUDE
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 2c76d4f2aa55..99dca0b656a2 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,12 +1,6 @@
 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
-DIST galera-3-25.3.20.tar.gz 3319355 BLAKE2B 0f00da318e11713d0e44f9de38a941fd0c18c1c64faa780c797262d467305f16bbb91c5e1d130b9b351a3956573aa297aa520239db54fbdc01d23f1be1530952 SHA512 4531073bbd13542cf4b0ed06788ec0b857971bd2e0161b8df2d90072b134d5343216c012d2f712ff336209f6e34920e2aadf7b0f58f91d6ce365fb2b65ed7fbd
-DIST galera-3-25.3.21.tar.gz 3317865 BLAKE2B e3f1fec764c171615d0db3a0375bf660185c3271470a0f9114299cc0159bf43cce7bdf4ad85cfb8e7fcd3d50917846ed3ce0726a3a5e371439f5ca0a1b2d63d6 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033
-DIST galera-3-25.3.22.tar.gz 3320337 BLAKE2B f55ac3f5dc18bb5aa0cf5f3fd8eee4cc7697324d3c62902303b36311dac06042b5a497be4beba2a202865cdd5866d37ca74239014ec3c3960847fe9bb3bc873f SHA512 4367ed8b36013e2c68c90d91b83a1929aa602bf82447f9d2382a1ad56f287867da543cdd995ed5791a1ba60f891fbc380afe1ecec983c2184f2050a83eed0fed
 DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1
-EBUILD galera-25.3.20.ebuild 1816 BLAKE2B 6699e5f545d51d15f7b82c17ce56fa5733a817a820a80ab6b84e16f7eef3bf88baf6ebcae54af0f06072a2e299b83d8a87478271efd378fa2d19fa70c11e148b SHA512 ac38b5e8a74494baebc889fe312eca034dc7637c3aab2ccc560f6e8ac4d81e95e36e9a08b8f2a11e8020fc4c8e01a5b2fcb2d0d453d51c6b94a644f7f853fb4b
-EBUILD galera-25.3.21.ebuild 1828 BLAKE2B 01cf04ad9d25318480f7d44242c4295ca49bdbf4de6f7d5650707e323a57fe0fe0883057d7a3aef7729c4485a65eca51ae45797c97a3c47b283150ab848a9d9b SHA512 701753adad3fe6556f18d53990f0fb8eb9acc8625dff14b6ce2666e168ae19b68f78d08935ff735fbca8ac93102549ebc0bd46aea17a1effb9d64de67a0a4a84
-EBUILD galera-25.3.22.ebuild 1824 BLAKE2B 9a0b5ca6268fa6b82920323d801a7fb5d4b3b497b950e777bbfbe7264407655b81c25ac2817bc84db7e1deb45bfc3e8ccfa611a87b97e7b91877d0dd450ffcd8 SHA512 e6e1126a523a996d99ed0286ef1ef04005eb48d9e99300e421dcdb7330fe8823c91f8eb22138af0a5b51256b1ffbb6c1420ca6487fbfbd12d805faebf4aeea57
-EBUILD galera-25.3.23.ebuild 1812 BLAKE2B 1f9944a4972c29adad2c1e74113155366e073af5c90d25bea7323aa0f1295bb74a66b0e0b1fe6bb2dbf97b8ee386fedd1f63b175862768563de9f1813783ec6f SHA512 94bb2004d6579ec099864fcd312867e87b4ee3b09ef7f849b5fa4d2065ee0d9dfcf2b9399210a28c6712c2c972df0c7cd1886c5bc627fb3344c2d83c761fa717
+EBUILD galera-25.3.23.ebuild 1834 BLAKE2B c9c0ce726168b44adebd8a862f0446865e9acfb22dee871c322a60c3a2bbd1b1e02fc363ed2840f09cad7f7ca984128319fb49fab2470e5dee97586f8d2b51de SHA512 f5389646c9d5ef832a430440e31c27e99488352a645657a2044f4739c45ef185207e0a3466a35b731b68a9d53c362b28ca4aa9ef91e403a506ee1a435e1a1aae
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.20.ebuild b/sys-cluster/galera/galera-25.3.20.ebuild
deleted file mode 100644
index 08d698fa170c..000000000000
--- a/sys-cluster/galera/galera-25.3.20.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-	# Uses hardware specific code that seems to depend on SSE4.2
-	if use cpu_flags_x86_sse4_2 ; then
-		append-cflags -msse4.2
-	else
-		append-cflags -DCRC32C_NO_HARDWARE
-	fi
-	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
-	# and -Wold-style-cast
-	MYSCONS=(
-		ssl=1
-		tests=$(usex test 1 0)
-		strict_build_flags=0
-		system_asio=1
-	)
-}
-
-src_compile() {
-	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
-	dodoc scripts/packages/README scripts/packages/README-MySQL
-	if use garbd ; then
-		dobin garb/garbd
-		newconfd "${FILESDIR}/garb.cnf" garbd
-		newinitd "${FILESDIR}/garb.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.21.ebuild b/sys-cluster/galera/galera-25.3.21.ebuild
deleted file mode 100644
index b81600aef42d..000000000000
--- a/sys-cluster/galera/galera-25.3.21.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://www.galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-	# Uses hardware specific code that seems to depend on SSE4.2
-	if use cpu_flags_x86_sse4_2 ; then
-		append-cflags -msse4.2
-	else
-		append-cflags -DCRC32C_NO_HARDWARE
-	fi
-	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
-	# and -Wold-style-cast
-	MYSCONS=(
-		ssl=1
-		tests=$(usex test 1 0)
-		strict_build_flags=0
-		system_asio=1
-	)
-}
-
-src_compile() {
-	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
-	dodoc scripts/packages/README scripts/packages/README-MySQL
-	if use garbd ; then
-		dobin garb/garbd
-		newconfd "${FILESDIR}/garb.cnf" garbd
-		newinitd "${FILESDIR}/garb.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.22.ebuild b/sys-cluster/galera/galera-25.3.22.ebuild
deleted file mode 100644
index 2800a6fdeeb3..000000000000
--- a/sys-cluster/galera/galera-25.3.22.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-	# Uses hardware specific code that seems to depend on SSE4.2
-	if use cpu_flags_x86_sse4_2 ; then
-		append-cflags -msse4.2
-	else
-		append-cflags -DCRC32C_NO_HARDWARE
-	fi
-	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
-	# and -Wold-style-cast
-	MYSCONS=(
-		ssl=1
-		tests=$(usex test 1 0)
-		strict_build_flags=0
-		system_asio=1
-	)
-}
-
-src_compile() {
-	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
-	dodoc scripts/packages/README scripts/packages/README-MySQL
-	if use garbd ; then
-		dobin garb/garbd
-		newconfd "${FILESDIR}/garb.cnf" garbd
-		newinitd "${FILESDIR}/garb.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.23.ebuild b/sys-cluster/galera/galera-25.3.23.ebuild
index 13c2d41fc3fa..bcb3d49b1677 100644
--- a/sys-cluster/galera/galera-25.3.23.ebuild
+++ b/sys-cluster/galera/galera-25.3.23.ebuild
@@ -25,6 +25,7 @@ DEPEND="${DEPEND}
 	dev-libs/check
 	>=sys-devel/gcc-4.4
 	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
 	"
 #Run time only
 RDEPEND="${CDEPEND}"
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index d14ed145fbc0..0d16485bb0c6 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -7,7 +7,7 @@ DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a7602
 DIST keepalived-2.0.4.tar.gz 845498 BLAKE2B f05b25b04e1dddbf5f6a90de6b4088b7fbd453f628130343f0688147ae40094e74a0892f3c30d91e41bad31c029692e7a1be6462d2906cdf53e4b82a98b4935c SHA512 b5df152b49a7b5187612b8719328c05fada57e8625c0e8053261c1d5f7afd09cc9b67200052d7a58ce596d1c718915109f5a9bf03520d80e0710157e938f72fb
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
 EBUILD keepalived-1.3.5.ebuild 1532 BLAKE2B 273a9f41e4a1d190a6ffd882b230f95fdc536cfc7d92a1b1b8f0e465165d80de282a6f4bc1d2450b6cecf6ea6086384602e6f8d8a639ff0fba9ba1f4b6cb1b57 SHA512 79052c15fd3329bb2493fb5833d951f70620d04cbe4077964416a029fe9ec953732061f751913b35c7c64a1f73c230a6d0691454d18ba9610270578397fc52f8
-EBUILD keepalived-1.4.3.ebuild 1590 BLAKE2B d478eed6ad58e06e3c08ae6f9086fa40787782fbff2f2da76b281605d8d02c84200e72da948a6ad959b1883e35df3a5d311e01ace955cae20b6f3168494405d6 SHA512 0d977c7098c262f7b537d2e463e6f5f9f7706b7867c863793db0441795082e6d143cb7fcd682fbc1dd7e0577677154c5c5e257bc489dff4be45d18eabcf5c6e5
+EBUILD keepalived-1.4.3.ebuild 1589 BLAKE2B 8904f68eff7b87dc34c43f1fd1b4aa997b00601f9e37335e772dbae16c171a3c713ba8fafe1d983c82b351ad6b94406bd21a8f6aed73dd1888cb6a5b5389fa6e SHA512 c5d39527428ece9df892c8ba92cc9c344c5bdfca2f42ca224d4693aa5f80fb47ab890086d461fa0a0567842896cb495f79409f3a8093cd4d365ab9f76432373b
 EBUILD keepalived-1.4.5.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
 EBUILD keepalived-2.0.4.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-1.4.3.ebuild b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
index 3b2f25d06b77..a7ddf6aa5a94 100644
--- a/sys-cluster/keepalived/keepalived-1.4.3.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="dbus debug ipv6 -json snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 8077c7b88e05..e72c6c72e99f 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,10 +3,12 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-controller-manager-1.10.4.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.10.5.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.11.0.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.8.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.9.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild
new file mode 100644
index 000000000000..3a0b835d0991
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild
@@ -0,0 +1,47 @@
+# 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="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 7b169c7c2933..a3252ac8c331 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,10 +3,12 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-proxy-1.10.4.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.10.5.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.11.0.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.9.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild
new file mode 100644
index 000000000000..882a7f40ebcc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index c37b3d7f64ba..d3885553cac4 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,10 +3,12 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-scheduler-1.10.4.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
 EBUILD kube-scheduler-1.10.5.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
+EBUILD kube-scheduler-1.11.0.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
 EBUILD kube-scheduler-1.9.8.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 EBUILD kube-scheduler-1.9.9.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild
new file mode 100644
index 000000000000..576989d30fd3
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild
@@ -0,0 +1,47 @@
+# 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="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index eadfe1b73d49..77e9037e0487 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,10 +3,12 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
+DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kubelet-1.10.4.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.10.5.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.11.0.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.9.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.11.0.ebuild b/sys-cluster/kubelet/kubelet-1.11.0.ebuild
new file mode 100644
index 000000000000..e1a41e8ec6bc
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.11.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}