gentoo resync : 06.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
commit: f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree: a38046712bbc3a3844d77452d16c84e716caa3d4 /sys-cluster
parent: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
67 files changed, 126 insertions, 1145 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ba65a16bc8b7..334ce269c53f 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 90c40c9ee423..c3924bd95b5f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -21,15 +21,15 @@ AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f4940849636
 AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d
 AUX ceph-13.2.6-dpdk-alignment.patch 612 BLAKE2B 7f75b53383979d5790862c91ff67b41c16d94e6572c9c387ae511401d22562493bddb296f47bef60ebf586683df36b5b62744ac30d43b1c4eede053d6ae4438a SHA512 058bf0a564a158356e5a87099ea8d1372123eeee8bfdb3c25870911dccc351f33e00793456c5c04f670946559cd49bc6a8cab5553dc99bebb570910b4a787d58
 AUX ceph-13.2.6-no-virtualenvs.patch 4137 BLAKE2B 9cef3ed31ec0ab2d13091b0b76071532ffd021a5627fa91808bb7eff382a4b29945eaa6bc529e8ee3176056caf9f62af0fb4b4210d2549bbc05f018fd4ecd75c SHA512 051c80c70a951135e2a00f6688ff03f604f89c65be47c4e00e2f72ee1a071be067cc8a7a60fd4ef78587a6b79b2b26d52d5dc3efbdcf0e11d4e3e1156483b03e
-AUX ceph-14.2.0-boost-1.70-sonames.patch 13703 BLAKE2B a619a07217895ae34a84c145930d9b477cc557d5088d1fb915f0427556330a24cb4385e953facf7cb2dcf99c1245bd25d2ebe25db56dec40648ad065bce7e873 SHA512 69f82d5f10b1237c17428b11e746422fcd0e1be735500032892d834361e636a23135cb7e6f537cbd808b74378325c24132a88f256abcce40ec1bdfe212b7648c
-AUX ceph-14.2.0-boost-1.70.patch 5556 BLAKE2B 7610a48c30fe5cf8462f498501a36c17c33289967e7d50456d6b8e6c467db89b768f73bb6e69ecd4c6dec0432d4fbb47af339f02eb510ba69770b9b122b41dbf SHA512 71ee1d583f71b2c52fee40e5105d1ff1d4b676230eac7c19f42754316c3958808304155a48992f8766eded52d3e28007b631680dca8b4672153fa44b8eccbbb8
-AUX ceph-14.2.0-boost-sonames.patch 14155 BLAKE2B 766a3e40c8a4d94d1cc52a511f0d440178c199cb37b1d06a792fe627df4f01793d8555005054604397d02d9e366521b10788f6e56381a6d967814370e4298844 SHA512 91184e32d3ef28a43bc8e0d53b4f359c5b2177250b39bbcc7921e38d044ba54610713826bc64450a0b2232450f68e724d23757cc5c6d39e50855060e86890ed2
 AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94
 AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d
 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
 AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38
+AUX ceph-14.2.3-boost-1.6-python-sonames.patch 987 BLAKE2B c70ee9689cbe2f7b3ad437285d9ab58a029ef35ea1a9f4a34891a32f3ac21068d28e0bbedcdefeee7f1748566e2133ce8c2c79eaf2a74b416a53c9cee4f3a7b9 SHA512 f8596e0c22270e771ae24498ea959e4d0079433198950fba05e172bdb6caa6ece75515f2fefc8aebc93cfd1b0a8ac087bf917bd99f6dd486fe855ba81a448c53
+AUX ceph-14.2.3-boost-1.70.patch 3591 BLAKE2B 12a947de968155cc9b73299757acb04f1588e988658f40b5bb6ef781d273a280543fd78a37cd5565599fe1bc7c187f7beaaa63a103d4b9ba1e7f3981e1027c87 SHA512 1bff4165c44a26950de22b01221e791b6cffe32653eceab0e9f03d3ae893b0b1fdab5659d5742335aa1fb519e34d2d841984ed8c844e8b8f1db8bc78bbed2472
+AUX ceph-14.2.3-boost-sonames.patch 13701 BLAKE2B 7d8fa01f56922770190d7cada4cd5404e1584cf8afc2a84aae9d0031e66d778af6e9b2072e405982ca652229b86169f5cdefcd7fe321a1626f9bec5ca014c54e SHA512 c6e7497a427c0ca10b4aa006020467e9ae6c2fb167f500d72d92adc953490a1f7062bbc2dcdeee61a6ab251fa3a27ddd6c64b190bb88e7993df1fd4084d39882
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -50,11 +50,11 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
-DIST ceph-14.2.2.tar.gz 117536881 BLAKE2B 2926c3d6fde5e9540d4e797dabf61451ce78e5d2f8d382d192fd8c1759620075860ab0cea7512330f2965d11e4b37a0ecce4fa11d9c5d256ecc884fa5f604922 SHA512 1ce61fb75e331cca39aaa8c0498bbb3cb874edb22ea45a4c2d82171b5e0c7c4ab2b081674b77177d5e612a0efdfa01de10a4becc4a7ee0eed1b2b3d358a72dc1
+DIST ceph-14.2.3.tar.gz 118349530 BLAKE2B db73d6adeca84426eee1b47a8ee68c4f94ee7a61e60ef1127153d19e02472a658877ebb7adfad5b4725d2c8c38855636bad1c44e79a3d3c397b56f74bf4b53fa SHA512 3d02e766a1d53d39355ee88738dd0233dc02f8a3cb44935194cb538b888507de8f8acdd99bf7890895f68795a310f53e2a8652305d5f2be5212efbd9046bd3a9
 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
 EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
-EBUILD ceph-14.2.2.ebuild 10064 BLAKE2B 541bfe6eab26c3d8fa2a9dd64ac6287252eace7d2648d3395431956cf79687740eb3c11f6af5f0cbfc484a789b16d0e2b019289f88981ec013f9160a71687648 SHA512 4879ef1d46d9e152f8199fa7811d6341f7e7dcdc1a9904b5cda4129319ca89104141a93b82b227fb548753fbe889791e46c065349c0c71b1c9fc76a53a866c2f
+EBUILD ceph-14.2.3.ebuild 9770 BLAKE2B 8827e1e4d8c734942599b393ec9625c378c81a4532e640860419067feb7b687f04ec8a7d5852e30bfac90c4baa26a37245aaf19a576f956cd70201195751edd3 SHA512 84e76634c608fad0488ca3992c91915eb8108f93b7f7211e1eb8cd6dbfbc99c486dec4ef88015a2b6cb51ac19760aa8695e12adc2e3603c3a9555b8dc60b1494
 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-14.2.2.ebuild b/sys-cluster/ceph/ceph-14.2.3.ebuild
index 0f25b21d3b71..f440a49160c9 100644
--- a/sys-cluster/ceph/ceph-14.2.2.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.3.ebuild
@@ -152,6 +152,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-14.2.3-boost-1.70.patch"
 )
 
 # dpdk and ninja don't get along
@@ -177,12 +178,6 @@ user_setup() {
 pkg_pretend() {
 	check-reqs_export_vars
 	check-reqs_pkg_pretend
-
-	if use system-boost && has_version '~dev-libs/boost-1.70.0'; then
-		ewarn "Building with boost-1.70 is experimental, and may cause runtime"
-		ewarn "failures. Disable the system-boost USE flag to use bundled boost"
-		ewarn "if you want an upstream supported configuration."
-	fi
 }
 
 pkg_setup() {
@@ -196,12 +191,10 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-boost; then
-		if has_version '~dev-libs/boost-1.70.0'; then
-			eapply "${FILESDIR}/ceph-14.2.0-boost-1.70-sonames.patch" \
-				"${FILESDIR}/ceph-14.2.0-boost-1.70.patch"
-		else
-			eapply "${FILESDIR}/ceph-14.2.0-boost-sonames.patch"
-		fi
+		eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch"
+
+		has_version '>=dev-libs/boost-1.70.0' || \
+			eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch"
 	fi
 
 	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch
deleted file mode 100644
index 497d59530511..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbabecbe97..d12b696bb5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
- 
- if(WITH_MGR)
-   list(APPEND BOOST_COMPONENTS
--    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
-   list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index bfab4ca436..90ed0cbb17 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -1181,10 +1181,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code.  Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
--  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
--  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
--  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+  add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+  add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
-   # In windows, automatic linking is performed, so you do not have
-@@ -1205,11 +1205,11 @@ if(WIN32)
-   # code to emit a #pragma message each time a library is selected
-   # for linking.
-   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+  set_target_properties(boost_diagnostic_definitions PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::disable_autolinking PROPERTIES
-+  set_target_properties(boost_disable_autolinking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
--  set_target_properties(Boost::dynamic_linking PROPERTIES
-+  set_target_properties(boost_dynamic_linking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
- 
-@@ -2018,52 +2018,52 @@ if(Boost_FOUND)
-   endif()
- 
-   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
--    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
-       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-       if(Boost_${UPPERCOMPONENT}_FOUND)
-         if(Boost_USE_STATIC_LIBS)
--          add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+          add_library(boost_${COMPONENT} STATIC IMPORTED)
-         else()
-           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
-           # libraries as a result.
--          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
-         endif()
-         if(Boost_INCLUDE_DIRS)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS RELEASE)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS DEBUG)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
-           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
-           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
-           endforeach()
-           if(COMPONENT STREQUAL "thread")
-             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-           endif()
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
-         endif()
-       endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1b1f19d464..21c222280f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -353,12 +353,12 @@ set(ceph_common_objs
- set(ceph_common_deps
-   json_spirit erasure_code arch crc32
-   ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -518,7 +518,7 @@ if (WITH_CEPHFS)
-     ceph_mds.cc)
-   add_executable(ceph-mds ${ceph_mds_srcs})
-   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--    Boost::thread)
-+    boost_thread)
-   install(TARGETS ceph-mds DESTINATION bin)
- endif()
- 
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
-   PRIVATE
-     crc32
-     crimson::cflags
--    Boost::iostreams
--    Boost::random
-+    boost_iostreams
-+    boost_random
-     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
- 
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..3f3823a68e 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
-   osdc client heap_profiler
-   global-static ceph-common
--  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+  boost_python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}
-   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
-   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index ccc4f74cfe..854aa6e5e9 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL)
- endif()
- 
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
- 
- set(rgw_libs rgw_a)
-@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
-   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
- 
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 20a64fd41b..a8bb323614 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -158,7 +158,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
- 
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
- 
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
-   tier_cxx.cc
-   $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
--  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
- 
- add_executable(ceph_test_rados_api_snapshots
-   snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 2bf6723c40..e99b8afa11 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
-   radostest
-   radostest-cxx
-   librados
--  Boost::thread
-+  boost_thread
-   GMock::GMock
-   GTest::GTest)
- 
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 9b2c6b6321..80e4cb7829 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock)
- if(WITH_BOOST_CONTEXT)
-   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
- 
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- 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)
- 
- 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_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
new file mode 100644
index 000000000000..860bd9624e89
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 05d1e61270..8b939b8af6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
+ 
+ if(WITH_MGR)
+   list(APPEND BOOST_COMPONENTS
+-    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
++    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
+ endif()
+ if(WITH_BOOST_CONTEXT)
+   list(APPEND BOOST_COMPONENTS context coroutine)
+diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
+index f46cc0d485..3cc6340b2c 100644
+--- a/cmake/modules/BuildBoost.cmake
++++ b/cmake/modules/BuildBoost.cmake
+@@ -205,7 +205,7 @@ macro(build_boost version)
+     endif()
+     add_dependencies(Boost::${c} Boost)
+     if(c MATCHES "^python")
+-      set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
++      set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+     endif()
+     if(Boost_USE_STATIC_LIBS)
+       set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
index ce2ee92b3d8e..26cea1e394bc 100644
--- a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch
+++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
@@ -1,45 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f97f96b5bf..f5e5d06d35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -657,13 +657,13 @@ if(WITH_SYSTEM_BOOST)
-   if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE)
-     set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-   endif()
--  find_package(Boost 1.67 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
-+  find_package(Boost 1.70 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
- else()
-   set(BOOST_J 1 CACHE STRING
-     "max jobs for Boost build") # override w/-DBOOST_J=<n>
-   set(Boost_USE_STATIC_LIBS ON)
-   include(BuildBoost)
--  build_boost(1.67
-+  build_boost(1.70
-     COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS})
- endif()
- include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS})
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..4254508570 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -137,14 +137,14 @@ function(do_build_boost version)
-     check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version})
-     set(source_dir
-       SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
--  elseif(version VERSION_GREATER 1.67)
-+  elseif(version VERSION_GREATER 1.70)
-     message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}")
-   else()
-     message(STATUS "boost will be downloaded...")
-     # NOTE: If you change this version number make sure the package is available
-     # at the three URLs below (may involve uploading to download.ceph.com)
--    set(boost_version 1.67.0)
--    set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba)
-+    set(boost_version 1.70.0)
-+    set(boost_sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778)
-     string(REPLACE "." "_" boost_version_underscore ${boost_version} )
-     set(boost_url
-       https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2)
 diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
 index e4be074ec7..4af3695dc1 100644
 --- a/src/rgw/rgw_asio_frontend.cc
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
index 6d7120037424..92ca32f5c8e0 100644
--- a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch
+++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
@@ -1,8 +1,8 @@
 diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index bfab4ca436..90ed0cbb17 100644
+index dd08ba5e45..19d3b8ad37 100644
 --- a/cmake/modules/FindBoost.cmake
 +++ b/cmake/modules/FindBoost.cmake
-@@ -1181,10 +1181,10 @@ endif()
+@@ -1235,10 +1235,10 @@ endif()
  # on all platforms to keep end user code free from platform dependent
  # code.  Also provide convenience targets to disable autolinking and
  # enable dynamic linking.
@@ -17,7 +17,7 @@ index bfab4ca436..90ed0cbb17 100644
  endif()
  if(WIN32)
    # In windows, automatic linking is performed, so you do not have
-@@ -1205,11 +1205,11 @@ if(WIN32)
+@@ -1259,11 +1259,11 @@ if(WIN32)
    # code to emit a #pragma message each time a library is selected
    # for linking.
    set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
@@ -32,7 +32,7 @@ index bfab4ca436..90ed0cbb17 100644
      INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
  endif()
  
-@@ -2018,52 +2018,52 @@ if(Boost_FOUND)
+@@ -2088,52 +2088,52 @@ if(Boost_FOUND)
    endif()
  
    foreach(COMPONENT ${Boost_FIND_COMPONENTS})
@@ -98,10 +98,10 @@ index bfab4ca436..90ed0cbb17 100644
          endif()
        endif()
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1b1f19d464..21c222280f 100644
+index 4895e84df6..55814e3b96 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -353,12 +353,12 @@ set(ceph_common_objs
+@@ -356,12 +356,12 @@ set(ceph_common_objs
  set(ceph_common_deps
    json_spirit erasure_code arch crc32
    ${LIB_RESOLV}
@@ -120,7 +120,7 @@ index 1b1f19d464..21c222280f 100644
    ${BLKID_LIBRARIES}
    ${Backtrace_LIBRARIES}
    ${BLKIN_LIBRARIES}
-@@ -518,7 +518,7 @@ if (WITH_CEPHFS)
+@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
      ceph_mds.cc)
    add_executable(ceph-mds ${ceph_mds_srcs})
    target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
@@ -171,10 +171,10 @@ index e9d3804c5f..5c6eb58de1 100644
    install(TARGETS rbd-replay-prep DESTINATION bin)
  endif(HAVE_BABELTRACE)
 diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index ccc4f74cfe..854aa6e5e9 100644
+index 8d5b0638a0..a147c55bc3 100644
 --- a/src/rgw/CMakeLists.txt
 +++ b/src/rgw/CMakeLists.txt
-@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL)
+@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL)
  endif()
  
  if(WITH_BOOST_CONTEXT)
@@ -183,7 +183,7 @@ index ccc4f74cfe..854aa6e5e9 100644
  endif()
  
  set(rgw_libs rgw_a)
-@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
+@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
    target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
  endif()
  if(WITH_BOOST_CONTEXT)
@@ -193,10 +193,10 @@ index ccc4f74cfe..854aa6e5e9 100644
  
  if(WITH_TESTS)
 diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 20a64fd41b..a8bb323614 100644
+index 5dcee1694d..60743be698 100644
 --- a/src/test/CMakeLists.txt
 +++ b/src/test/CMakeLists.txt
-@@ -158,7 +158,7 @@ add_executable(ceph_omapbench
+@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
    )
  target_link_libraries(ceph_omapbench
    librados
@@ -266,7 +266,7 @@ index 4fc53d2406..e6304394f8 100644
  add_executable(ceph_test_rados_api_snapshots
    snapshots.cc)
 diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 2bf6723c40..e99b8afa11 100644
+index 3988e94bd3..b2a720b8a0 100644
 --- a/src/test/librbd/CMakeLists.txt
 +++ b/src/test/librbd/CMakeLists.txt
 @@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
@@ -279,11 +279,11 @@ index 2bf6723c40..e99b8afa11 100644
    GTest::GTest)
  
 diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 9b2c6b6321..80e4cb7829 100644
+index 36df883a66..43d3456089 100644
 --- a/src/test/rgw/CMakeLists.txt
 +++ b/src/test/rgw/CMakeLists.txt
-@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock)
+@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
+ target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
  if(WITH_BOOST_CONTEXT)
    target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
 -  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 7140b683890f..cd440570fe52 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,20 +1,16 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-apiserver-1.13.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.13.8.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-apiserver-1.13.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.13.9.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.14.5.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.15.0.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.14.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.15.2.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.15.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.7.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.4.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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-apiserver/kube-apiserver-1.13.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.6.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.8.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.6.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.0.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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-apiserver/kube-apiserver-1.14.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.3.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.15.3.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index f97e08db59ae..f74c52d578b3 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,20 +1,16 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-controller-manager-1.13.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.13.8.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-controller-manager-1.13.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.13.9.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.14.5.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.15.0.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.14.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.15.2.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.15.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.7.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.4.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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-controller-manager/kube-controller-manager-1.13.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.6.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.8.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.6.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.0.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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-controller-manager/kube-controller-manager-1.14.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.3.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.3.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.3.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index a812824db73a..1fc82d152f03 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,20 +1,16 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-proxy-1.13.7.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.13.8.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-proxy-1.13.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.13.9.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.4.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.14.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.15.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.14.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.15.2.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.15.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.13.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.7.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.4.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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-proxy/kube-proxy-1.13.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.6.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.8.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.6.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.0.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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-proxy/kube-proxy-1.14.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.3.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.3.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.15.3.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 7ec62c814922..11306cb2f140 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,20 +1,16 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-scheduler-1.13.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.13.8.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-scheduler-1.13.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.13.9.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.14.5.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.15.0.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.14.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.15.2.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.15.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.13.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.7.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.4.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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-scheduler/kube-scheduler-1.13.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.6.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.8.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.6.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.0.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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-scheduler/kube-scheduler-1.14.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.3.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.3.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.15.3.ebuild
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 5b1a14dea0bb..98d55ec2e4a8 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,20 +1,14 @@
 AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
-DIST kubernetes-1.15.1.tar.gz 26623024 BLAKE2B dcd30345a4fcef318b05a9b5cb2fceeb3c33cabe4ce15af8dc3eecfbf5803707fa514c800035ae695c1e7abc5f0dbedb0839dab3e99b2588e01f54ea0659fb0b SHA512 4d662869db8c62dfcbab1aa2ddb1dcdda81385987c864b324312113fafa61143c481e4e5e601d0e00df539a7e71323745e2c0182b6b06a38d926c2e2ca492f1b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kubeadm-1.13.7.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.13.8.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kubeadm-1.13.10.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.13.9.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.14.3.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-EBUILD kubeadm-1.14.4.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.14.5.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-EBUILD kubeadm-1.15.0.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
-EBUILD kubeadm-1.15.1.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
+EBUILD kubeadm-1.14.6.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.15.2.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
+EBUILD kubeadm-1.15.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild
index 6c4b699b7594..6c4b699b7594 100644
--- a/sys-cluster/kubeadm/kubeadm-1.13.7.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.4.ebuild
deleted file mode 100644
index 763c3838067b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.14.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
-	popd || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.6.ebuild
index 763c3838067b..763c3838067b 100644
--- a/sys-cluster/kubeadm/kubeadm-1.14.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.14.6.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.3.ebuild
index ffd3646b62e1..ffd3646b62e1 100644
--- a/sys-cluster/kubeadm/kubeadm-1.15.0.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.15.3.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 0ba40a86a99f..650938741f72 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,11 @@
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kubectl-1.13.9.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kubectl-1.13.10.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1
 EBUILD kubectl-1.14.5.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.14.6.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.15.2.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.15.3.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.13.9.ebuild b/sys-cluster/kubectl/kubectl-1.13.10.ebuild
index 6f0d80ff6350..6f0d80ff6350 100644
--- a/sys-cluster/kubectl/kubectl-1.13.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.13.10.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.1.ebuild b/sys-cluster/kubectl/kubectl-1.14.6.ebuild
index ffd3646b62e1..7a61b25dce90 100644
--- a/sys-cluster/kubeadm/kubeadm-1.15.1.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.6.ebuild
@@ -8,7 +8,7 @@ EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
 KEYWORDS="~amd64"
 
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
 SRC_URI="${ARCHIVE_URI}"
 
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.8.ebuild b/sys-cluster/kubectl/kubectl-1.15.3.ebuild
index 6c4b699b7594..7a61b25dce90 100644
--- a/sys-cluster/kubeadm/kubeadm-1.13.8.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.15.3.ebuild
@@ -8,7 +8,7 @@ EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
 KEYWORDS="~amd64"
 
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
 SRC_URI="${ARCHIVE_URI}"
 
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.11
+DEPEND=">=dev-lang/go-1.12
 	dev-go/go-bindata"
 
 RESTRICT="test"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index c938f653c450..96a23f3ed47a 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,22 +3,14 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
-DIST kubernetes-1.15.1.tar.gz 26623024 BLAKE2B dcd30345a4fcef318b05a9b5cb2fceeb3c33cabe4ce15af8dc3eecfbf5803707fa514c800035ae695c1e7abc5f0dbedb0839dab3e99b2588e01f54ea0659fb0b SHA512 4d662869db8c62dfcbab1aa2ddb1dcdda81385987c864b324312113fafa61143c481e4e5e601d0e00df539a7e71323745e2c0182b6b06a38d926c2e2ca492f1b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kubelet-1.13.7.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.13.8.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
-EBUILD kubelet-1.13.9.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.14.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.14.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kubelet-1.13.10.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
 EBUILD kubelet-1.14.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.1.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.14.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.15.2.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.15.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.13.8.ebuild b/sys-cluster/kubelet/kubelet-1.13.10.ebuild
index 447655a3a284..447655a3a284 100644
--- a/sys-cluster/kubelet/kubelet-1.13.8.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.13.10.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.14.3.ebuild b/sys-cluster/kubelet/kubelet-1.14.3.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.14.4.ebuild b/sys-cluster/kubelet/kubelet-1.14.4.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.13.7.ebuild b/sys-cluster/kubelet/kubelet-1.14.6.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.13.7.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.14.6.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.15.0.ebuild b/sys-cluster/kubelet/kubelet-1.15.0.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.15.1.ebuild b/sys-cluster/kubelet/kubelet-1.15.1.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.13.9.ebuild b/sys-cluster/kubelet/kubelet-1.15.3.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.13.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.15.3.ebuild
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index c4261ad19f8e..5fed03728b2a 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -3,4 +3,4 @@ DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe
 DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
 EBUILD mpich-3.0.4.ebuild 2529 BLAKE2B d60c5eb9d4a9b7838de58dbc93c695ccf379136004a9ea670f9002c8b1173c5d8d7fb5107d29940025bf417dd5f2b3289ed44d062ba0de1f2ccfe77b14ee217b SHA512 c4588f2b52025fe4fca70b6b0b0c83b5595c4f2d281b744cede8f9ccfc73c0c880dea5f2271fb54a52f64a759488e194a14e5c55e017be63690a7aea9e9d2707
 EBUILD mpich-3.3.ebuild 3795 BLAKE2B f712a7c70d2e444c3aa8fa3d32a0751eae7cee897e845537d05e7c8f7cc400a30a2bef493f9a7d29e1499856d930798d535ac19ec3be9ce919abbe31cfa7a971 SHA512 8da57e216efb628c9a523b433b67de59b77e627bf5c6dfd37ea2a16a4acb6c812ec147eedfc45edaaeb17fdef1e002965b1f9ff7cb140cc2af3111798ac00769
-MISC metadata.xml 658 BLAKE2B 2fc81d1e02086392471d734b5837e8a7ddf9bc8f06ac24766f7bb2e2c7f735a92fd80ed5de47f693224058dcad1c8e89d764c81a2568c363f28a59c50f275112 SHA512 fb8427b6757ba0571f5f78ee71bfd80ebf9e0835a1016b3ef1f66d27a2022033118c7a1fbfe4011e591d321bae9df48c4e4554e3daaa1a3033bee74b5f4c08fe
+MISC metadata.xml 547 BLAKE2B e96f9ca4c9bca4aabd1ecda3b3b03713e3841b8a09facc5058f8dd1ec34a4948d1cb1b314b55c2a9d76975babf8ddccabb6c5496ad77abb0b07da43c7e05cfa8 SHA512 850e8575f14a0b0c5bbf81ff738975211a611d6938abddeb98b28538d7176c1f167690f59e705c953792c6bc93f38424247ef1295d56556e82c345131d43dca1
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
index 6cbe440faf21..6884ae20d36c 100644
--- a/sys-cluster/mpich/metadata.xml
+++ b/sys-cluster/mpich/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-		<name>Justin Bronder</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>balaji@mcs.anl.gov</email>
 		<name>Pavan Balaji</name>
 		<description>Upstream Contact</description>
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 99f54b428e42..016b72e29d20 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,3 +1,3 @@
 DIST mpich2-1.5.tar.gz 22826035 BLAKE2B 75075fbdd0111725e5bce1e828561125cdba2c91ecfb5af7c6ebd0603f8de05aa5813e57bf05b276607d0a6c0a378862b5631ab988f87e67299e7f651efdc76b SHA512 01ef68accdd60af805705c1c7a144a570eee6f01984939fe151a093f963c956fba366247b1058885ba1a2ff626278d30e928e03d394bd6cf2a4b6dab99586c15
 EBUILD mpich2-1.5.ebuild 2617 BLAKE2B 6cdfb3eae7f0e5289770f39b3b6a303dbde63e57b5ad8f59c6de1e7c6d67b54f0cb22f9222a7b2eb139bb461492c060f9a87b09f3d137c2e24a04e355646e860 SHA512 92f21d4a01e118f1f8a4b993aafe09dbb3712b7acda868abf32b0fc2458beda379bed9edbb3d73bb0b3066c8131708e79845b1586ea5b0e194f3a24c911dd438
-MISC metadata.xml 537 BLAKE2B 9eae46c14d7c3a9005282ded5342fcec178348c6a408427d0e27344201ffd46f3de3fb68c5ad981a8054d48362f71c5ef1bed6833afcadcbdfc237b6ab74c4de SHA512 6fef333f26872e307ad083ef2e9feafcd264b363feb519e61dea1e2b254b5f3035ff152d84f61311eb3e54c0d08f2a858f446da60ceaa74bd31466fee9ac5500
+MISC metadata.xml 426 BLAKE2B c84c0b456040e5826bbe33d90969ce14cc9e7ed7e1724935ae785fe7dcd14c00e1abbd877e2b57860cc049fefe7483e1a4145270ebbe3b07ec716a43a595dd9a SHA512 b684cf0962e273dc2c9472c5e05575c1ad31801fa31e30bab9792e407269d436186063d9be3e63fb8417995689a4308442a100878f2d2e6946c49c3150ef3f7f
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index d88fa13bcaf8..9c96829dcdf1 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-		<name>Justin Bronder</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7265a0a53bb6..a004fe358ee3 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -16,8 +16,8 @@ DIST neutron-ml2-plugins-13.0.4.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8
 DIST neutron-ml2-plugins-14.0.2.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
 DIST neutron-ml2-plugins-2019.1.9999.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
-EBUILD neutron-13.0.4.ebuild 8373 BLAKE2B a8fe7ffaed5896881e6f48bfe605927f6785dc4722a6a110e8bd9c441f2dc8e33aab524b15b1aad2e40d9025a7ad273868ca6f0b7eeee462a33490d79eb3e50f SHA512 24abe3297c803492b6aa2fa7809dc2e6583a509eb16f52fbb6b2c86f46cc3297998f6d3c9fd136e644159479f679639a821dfb20f09d8bf133e5031c36ea54ed
-EBUILD neutron-14.0.2.ebuild 8414 BLAKE2B 32b24492c363e5852af75248d15989982d773771e5ddb2e5c4c1e1665fb7f0d173ed26a53f0260b62bb872f16000720606dbc10863b2ea6920b9ef742e6a5f01 SHA512 88db9ff23bc6b0a4f4ff33ff3bec7e5c4974942ffd5f62f5dae7996e3be5c4cd5f924f93db924d3a6028b4698804029edcbad077e5c3d305ff581975ef402af5
-EBUILD neutron-2018.2.9999.ebuild 8375 BLAKE2B 2da1a016c34f317d120e83b62f3bbffb245fba4767cc61be924eb8dd6a143066c600fb63bd701b3a156c9704ecd18ab53a5661e81445c22f0f27eb46575f514e SHA512 9294e49832641af2133b1fd1d098c58cc44b23b06188648a87ef4eb12df0a96119de5486c94bb1ac2b0e5401f46cd073e5e8b55bed081fc9d6fade64c046445e
-EBUILD neutron-2019.1.9999.ebuild 8416 BLAKE2B ddf244c9bf918d4b1decae18cbf6f6b9fc674c45ac2d4fa1ffe6cb49a5e8e0aedd7b1346a8505dd477519a7d2813c680a3eedc1f0c4a3f24b39bc06d59a37869 SHA512 a87ee79367d3c01e8a3a688f925a517f6956b95a4465fab0775541a3b63b454ed991f21258ff245b43811930d8210351041e005e7089d6133be5a0e1e4604a28
+EBUILD neutron-13.0.4.ebuild 8347 BLAKE2B 329f7e858f922aaf211dcd925fefcbd61418f5198d63b644a109634765aef14142b99cd68e7a8436eba730078ae0f21179819b121c020ecd3d2d7e743ae305a5 SHA512 57d8d5f18f1d45d23418f4599770fb35b757c4ca1e584d559e64d839308a9d71928db37a7276abf074294718b54c83f7e485d6c88978ec7f2bf26de29aacb46a
+EBUILD neutron-14.0.2.ebuild 8388 BLAKE2B 3716d11d139f7ecee31b49009e07f2b5219c6a953a83a375d933aa6fb67c961a697341cdbe13da38bf09819607eafd07e3df6a106e41cfa1eccd38fc209a30c1 SHA512 42759d4cb73245f0fd5ce6a75d8c659e06eb552dc58b7c1723ebc37a1e49f56e74dce78e0b74d5befa8dae0389ed5b089e1c9c4bae5eeeb4025ab5daf12c3fa2
+EBUILD neutron-2018.2.9999.ebuild 8350 BLAKE2B 40303975455b8e20a9b55d228b0653104ddaa8f1a20000188d86da895af95c7030b3931b1d71c3038235cac8efd37dfe547ee8da0a57611fedc2de743f388a96 SHA512 c9240d19364c27113ec1e63893f86c2a5df66af5e5610becf53d6366868ebe6777d20f4324905a5a502cfe224dd05a3820255b016b1cbdd3b30ac8678092e224
+EBUILD neutron-2019.1.9999.ebuild 8391 BLAKE2B 6182fa27064f390f6dc459d7a0d6b926ff1e1ad43d380e654e6ef5ed63fa91e130bed6fdc93a815e0c7eca598848a61596766e9fedca44439a2b99b589757224 SHA512 56d78135fed5fbbd23c789ce9037bcaa805ab42da39492dc2d41b5256d1f7139db92f119ab6c03b74a898e18a5e20ba8295ca54b17fcf2629d8f8ca06bb4777b
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-13.0.4.ebuild b/sys-cluster/neutron/neutron-13.0.4.ebuild
index 7379b294ab07..d862d7790857 100644
--- a/sys-cluster/neutron/neutron-13.0.4.ebuild
+++ b/sys-cluster/neutron/neutron-13.0.4.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/neutron/neutron-14.0.2.ebuild b/sys-cluster/neutron/neutron-14.0.2.ebuild
index a73abfd16ba5..137caa2c7569 100644
--- a/sys-cluster/neutron/neutron-14.0.2.ebuild
+++ b/sys-cluster/neutron/neutron-14.0.2.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/neutron/neutron-2018.2.9999.ebuild b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
index bd81ba27f6cd..5bd5528fe264 100644
--- a/sys-cluster/neutron/neutron-2018.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/neutron/neutron-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
index 58d765b61988..dca9c322db0c 100644
--- a/sys-cluster/neutron/neutron-2019.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3e107484b19c..d57a71b5f736 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -9,8 +9,8 @@ DIST nova.conf.sample-18.2.2 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a3396
 DIST nova.conf.sample-19.0.2 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
-EBUILD nova-18.2.2.ebuild 9500 BLAKE2B c4fa7159a2fddcf8a3c5eaa598d6ce30074701f6f56c12f7e7f96717cb96748676f4e2f6b562d04abf89b4662a8b1c4fc6d6c93da3a61849ab1e39e4b3951d0e SHA512 bbb0b6b791c39681ad14dbfd63534d74ce40872b2cbb14181e151d93bbfd60f89daa4e702eacb7e7fdce25adb08aef70c525f3b41a2618cba9bb9f21128bb5d7
-EBUILD nova-19.0.2.ebuild 9589 BLAKE2B e8af169540a4a7d9980416cc2c60cf4a4b3eefebafbac928f50bfd7cab407e5b0778105349b3c19edab023fb27cda9e4181c911f718ac98cc1721de32a6838be SHA512 32c3f2888abaced0c49a0b43809cd5789fd4d4ebd4c602bd9ccd3a37c3762120fedb0de10772009a3c329cf62194c795b4df45afe9c345619fc91b2f9b398ee6
-EBUILD nova-2018.2.9999.ebuild 9503 BLAKE2B 93d037866011c61dc8d61283d8d6a3897f8df51d35e9f5688ad8831d07033a5420ea280e2c51ebf5fb700520463f89e0fd1a596b20f0948bc63a44287da5ad61 SHA512 08acb5d955ef369c3b352009be92885c90e9632a5cacdca9ccc52ea11ca6c32d726a18b290df79ff60c00601b4b8715fa14721e4ebf67788c504fda743d098c7
-EBUILD nova-2019.1.9999.ebuild 9592 BLAKE2B b9d936d1b245e40280053f76dbcfd25730c2b9aa1d64b4c5e815c8256e4827023dce5ee39d1b9cbb977a8e9765114193f91e049e9022e4520e2371ee6602bc5b SHA512 f78cd0043406c2d62ca01f86f4c36efd3e21623cb625ad5a459e2e17496b040afedd32411033218ebcc4627d6c14f6ff203d0f4dc207bfe1da05e3ebd79daf27
+EBUILD nova-18.2.2.ebuild 9493 BLAKE2B 1b9ec29a2a6ff3eb43933d2871d5c7c2caec586cbd2e15df1b79e98a39e852de164b43647c1c00ff2a3557d39c6b697686bee3a3c53a9201a8b0726e88406356 SHA512 fbb3e4561c7b5ff86da1216ad3ab9e891da0564ce77b290d1abeec910a13738da14b46caf902ddf388513f835e15dd0774811ec885ba6b919894db349c9a7b57
+EBUILD nova-19.0.2.ebuild 9582 BLAKE2B 285306242428951b117928d492e8babe5786e03e4065e8556395c7cf67afaea3c10d04acc6cb74907a23aa44535b4c8661635dafe0727ade47fdae1359395a38 SHA512 9d61543f6809972a18843d122a3c098f956f27f1954e179fb0bbe235c974bc01c255c400563b4c21d4ffcb991174792548991c402aebedb76851d05cb9c15486
+EBUILD nova-2018.2.9999.ebuild 9496 BLAKE2B c962c25fe0107327d30eb0fde3163e4722763db4e2b3b0ff0250f9dbee071807db7a5dd9404e4425d758cb6408efafa571f79fa50cd0756355ca6754513668e6 SHA512 62756e826de4bed6fa6d185e92defe459e9e32ca53b7b860c882896e0dd306d04918cd932c25311d0700ccefc3effb16e5fadcc4e17d7e2074088d90e3f49734
+EBUILD nova-2019.1.9999.ebuild 9354 BLAKE2B 92302f07eb36bcf62aaefaa51cec5795692823fa886978c70bbbcae000fa46f6b4baeb355831fa58bc8a9bd8fd57fe4dde23c7d50a250d6492c080929979c375 SHA512 cca0284a3e11f5b4509bc755e1390aa383809d8acb7baaa40345d41d09da9222ac7aa968fe14fa95528268410a1bc5f474c3acc7145256709109a4c26278ebd4
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-18.2.2.ebuild b/sys-cluster/nova/nova-18.2.2.ebuild
index 123609323504..f57c926d0e3e 100644
--- a/sys-cluster/nova/nova-18.2.2.ebuild
+++ b/sys-cluster/nova/nova-18.2.2.ebuild
@@ -242,8 +242,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-19.0.2.ebuild b/sys-cluster/nova/nova-19.0.2.ebuild
index ffc81bcc8570..d25e3939bb40 100644
--- a/sys-cluster/nova/nova-19.0.2.ebuild
+++ b/sys-cluster/nova/nova-19.0.2.ebuild
@@ -244,8 +244,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-2018.2.9999.ebuild b/sys-cluster/nova/nova-2018.2.9999.ebuild
index f0694e7ed9a0..dd30ccf5b550 100644
--- a/sys-cluster/nova/nova-2018.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2018.2.9999.ebuild
@@ -242,8 +242,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-2019.1.9999.ebuild b/sys-cluster/nova/nova-2019.1.9999.ebuild
index a28cdc16dcc1..4eaf50a66197 100644
--- a/sys-cluster/nova/nova-2019.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2019.1.9999.ebuild
@@ -241,13 +241,6 @@ python_install_all() {
 	rm -r "${ED}/usr/etc"
 }
 
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-}
-
 pkg_postinst() {
 	if use iscsi ; then
 		elog "iscsid needs to be running if you want cinder to connect"
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 2708949b4e9d..36b018820331 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -27,5 +27,5 @@ EBUILD openmpi-2.0.4.ebuild 5995 BLAKE2B f0e8b0971b2e9cdae4a46b771bee622a4c35584
 EBUILD openmpi-2.1.6.ebuild 5606 BLAKE2B 2303401b7048a5e5a05552f79e964e45f1d0df2d315c993ebb05bac0f46fd156cd1cdb98ab47e1e730bbfb162343e6a457e69432c4901dcf236f88721dc3ad90 SHA512 e0ed1db674b40c82bbe85a22dbfcdd0271c95e76769799708be0ca2c652910ef378d7ea07c1a87d6b0bdd2557a6920b02cb75f4aaa702bef114a1ed505e7abc2
 EBUILD openmpi-3.0.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
 EBUILD openmpi-3.1.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
-EBUILD openmpi-4.0.1.ebuild 5432 BLAKE2B 21fff5d4df3150c1b7e420ac01000f9f350ee65f948d96e177a7b0bf59fa8e9ddaea021dbe23bbb9ac85dd94f7dcc68af4b7eb1589dd6291bfd81800b460edd0 SHA512 aa5f710e1485729b0f39f9eb993bad586bd93a1fc32476478bb69313c8e4810b703889a47364b5af5a4ed1d8cf344ac570bafebbdd427cf834e79d86bb8f739d
-MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
+EBUILD openmpi-4.0.1-r1.ebuild 5434 BLAKE2B 30b8695cacf0f65506d99a63df4cccac15af7aaac3ad54b75ca3240b646fe6a6efc5952426b61b12fa1c35c9aab1303d98a9ecc19293dd9804f4bb9e5efa7aa9 SHA512 de78d49aea8df2db7e9e2c43d8d577e95c5a3064afe2f988ad45fa463d5ae8b3e87d12c626b24048354ece58bfdb50b7894e634d00f2b5a9febfea2bc7eabaf0
+MISC metadata.xml 820 BLAKE2B b606cd3e91faba78d213cd55ef0f23f03085b78374b604dfa5f2f4ff3add9a6cc4c42b071579e30f9b72197c2b41dbb302d8f393881392f400296ff6b59fe0db SHA512 9025216b610924a248c80843da4e90e615078933d332ca06f4ac9c1fa46bf94a444c6b2704f1ad470f7beed797c66ee59cb961cd88e17c5b5c18d315a2233f5d
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index d909acfe0a0a..e319ff476a17 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/openmpi/openmpi-4.0.1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
index 25592104fbbc..aaf63224f630 100644
--- a/sys-cluster/openmpi/openmpi-4.0.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
@@ -47,7 +47,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
-	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index d7c9a5a535e2..ac986f886456 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -7,7 +7,7 @@ DIST swift-2.21.0.tar.gz 3025042 BLAKE2B 847b11fa61620cdd07acadd1d4fcc43c9fc53ec
 DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
 EBUILD swift-2.20.0.ebuild 3930 BLAKE2B a34c98f02fe58bf7091945fc3730b40d8b8ffc4523dabf7b6e74daf665d5f41ace12f1907a2dafc96262ed13ab64601aef3d055963602d807d01da794a860ec9 SHA512 0e9f6d58e26c77ade950c749e91cfa0239c0f94ab116600ce20e4250c29618a56492ba93435225373edf2f165a9a6f4a2c3a6781381f571190d1e6e3db72f518
 EBUILD swift-2.21.0-r1.ebuild 4016 BLAKE2B 2234265b662c37a0dcaf5eaab7662d4e8c756c254e25fd95ad02ead7dcb78039d6af7d61f53e17a19f1571e32a612a958e83797e05f568ad33a73adfe5ab0e09 SHA512 4e5a3fd19e2689652f14246401da49245f9d84716b92f1593de2444b5d003218054b957449354a3308bb8af62aa9e27d8b51e9117d6d264cb261c5205403a138
-EBUILD swift-2.22.0.ebuild 3957 BLAKE2B 5787186650f21c35b49f6d34249b385cc9bfe9f8518f79e6d658eb5f7c7d689d6fd0f4029bf54956ee348c7cda29685f967af331d4ffa79051c9ee056b68f1ae SHA512 53aba322f59211cfb3dfd5f158fe9c2e6fecb46688bf6b28bb820d71093a80aaf849ef48239aee398833aa026cbeb433ea1638c5e3c75110a39a6943619b865b
+EBUILD swift-2.22.0.ebuild 3955 BLAKE2B 762991f57c3e94f7179f658402f864b3cb956c722725da35dd431c713e9cb15aa3e3a751513330bd7bb7a64df0d88955f21be73d4440c322f49364771dc4ec7f SHA512 5fd0d198687daf9da9ffe2d304620ed98355772071faa3929b83876599528837e47a732e534616d96b67d800ca94438bc14e52c9b4ee9f1499f55bffe2ecece6
 EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
 EBUILD swift-2019.1.9999.ebuild 4018 BLAKE2B ded5587949b6bcb9db88032898134cf177990cc6248618cece257093e018253dd343887c8ec106025fa0d999a3f87ffac2e071706b9b968f4522ffe6a2e94557 SHA512 263739a2220d4933511bd3ca8f7d0525f3cfca78511924125d84a02ce7012bc63e7b6c284af31908e769dd0fbb5e2b69eb09b4a436470f17d873f27e92ad7093
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.22.0.ebuild b/sys-cluster/swift/swift-2.22.0.ebuild
index 20826c55bc75..a88677f29fd8 100644
--- a/sys-cluster/swift/swift-2.22.0.ebuild
+++ b/sys-cluster/swift/swift-2.22.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/stein"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
commit	f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree	a38046712bbc3a3844d77452d16c84e716caa3d4 /sys-cluster
parent	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)