gentoo resync : 16.02.1018

23 files changed, 434 insertions, 90 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f8e32551cd51..fa023e90b278 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e3315ee146d6..bdab5701e8f4 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -12,6 +12,7 @@ AUX ceph-10.2.9-dont-run-lsb_release.patch 2862 BLAKE2B 94e31ddba114ff798f3334c7
 AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980adbaa2d68045e6378cb68904e939d8e7f7325fc5102151ea4e1f5133751b620885d1d0b3d6fe565291272b4b2a SHA512 9864da1a83c1145d143eedd73fd3ff142b354fd0bffa73a25f30eabd68d7eddee82208be7b7da74536ba4c996808aa77fc55bcf562a409240d69cbd249ef1d75
 AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e2958497bf588515b0319d4e2c5cc5a6c5949d4c2c6f0d41f94aca2c43c020285f4b467f42f9f9a3944ce3a5600dc95e3b8443c8420cfb76128 SHA512 ecf4067776a146cf2aaf0b83298e508a6073147e555f4f9ba73cf2d9e0fe26d9ea72fff8af1c67eaa436e30d32ed260f75683c7d77b27a88fbb098b561d13f0d
 AUX ceph-12.2.1-systemd-unitdir.patch 345 BLAKE2B b97856edd071beb28e46301e97f996176dd62b6824ccc2154b7640ce629b1c0698c2d79e074a2df3af91ab34d6f7e84b2a5a04d41d8fa3b64b571a016ab14f19 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc
+AUX ceph-12.2.11-boost-sonames.patch 7971 BLAKE2B 259be2dd12c15d5951e0ea4f2da50a003352cef9e1228d70be0e62b426aa2e5e1ec8509707511986b9067dcb98d96b9b02ac9f5ddeca72bccdb162fdb20cf72b SHA512 03af0a0f2c287f3edc685857d51b8e8d370337f42a1e0630deb1f69c8bb2fad2aab065d43fa22ca099aa51d3b5b962e0aa63a5f7110bb2b39577df71b65c18e5
 AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae
 AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e
 AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48
@@ -58,7 +59,7 @@ DIST ceph-13.2.4.tar.gz 90910119 BLAKE2B eb395f435552d91789869bd92fee2a8b2fef155
 EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638
 EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f
 EBUILD ceph-12.2.10.ebuild 8037 BLAKE2B 2c6d6f203aa2705b95559667a8a9174d44b7262a5c7bf4abaf3405c29b320d06a47ec83f12caa1d17c46fcd0b3b8e774713ff8fec44f2d09317869ab200b5e4c SHA512 65ff0201abef681ba8888c8093f33ac4f7a3d000ad089e1b6c1a96da5464c96d6001e784d39904b96fb9152686694105320ac15c4c96401e17ba7906470d927e
-EBUILD ceph-12.2.11.ebuild 8008 BLAKE2B 99b6961c811a3b5d1b37bbceeaa08ca0d7f1608fdda954d0e81cc15263375cd64bf7840600e4713e667d231d3f95edf3640402a521ff6e1877f26b73cfc4bb23 SHA512 c3b6d6fd73cdf392bae790a333664d7fab5e5cc0d8bc1d089a0505d2fe3463f3559a59e1dac3124cac87e10bce0962f6b2a4bcc49870d060858a99f7dc6f144b
+EBUILD ceph-12.2.11.ebuild 8009 BLAKE2B 2a4d5172fd5663da56b81ccf21a6a5fd7c789e0ec908ef62f836319e489e8e82fe4cd38dc3b200736137d408c4ebc2c02c20cc89cc35dd17acff5396d36d0517 SHA512 fb4c6e8542b0cebe3a66611575980de4a74fb12152ff338948e57d565de6f4b4fbe1567b6caa2c719dfb3d5aa6f2bd32ac94623465c03feae847725681964be1
 EBUILD ceph-12.2.7.ebuild 7886 BLAKE2B ce57a94c7a55e88ecc8729fc3a46433854d65d222561b418416b3aab52c689cca2487304b4925a070834e75e3bf82d82dded2207683d4374fd7314d8fe0aeb36 SHA512 69b46ff16141c2efeb0e650b3f0f48905608f33ca8316a6b394262cfb12d54b65ec07a5805053aae71533f5eb62314d5435f25a835635b7d3fc13666865d0615
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7e3f1ab2902eddbfe6e45bd4065fe38ad41e3306b83bb6a622854efa8239d2ff716933e59bf06d343fe341823d2 SHA512 c96e0af6586053b8ff827c049acc8e6cafc2ec31052ed90d2b1d6b3f4daa30ffd41d162eba3aa279b2a07190ed21840032589f88a21be730d06885814eb5f4a5
 EBUILD ceph-12.2.9-r1.ebuild 8026 BLAKE2B 99ae7bab9bc17382c9226f966101cb6a6315403494c83e8973d12b1bd669517a103c52a003f8dfbe487a6558b138200a34eafe6ccf96080915b0344ab78074a4 SHA512 cc49eec85c6010d7cda157fa8adfe92db10946474fa36a4e75452c2f66004f2a3c65c75ccfb885e50f0009bd38ccbf23755b95223f4ada974000986e920bf79b
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild
index 4fe896d4cc11..d828bc7be4f3 100644
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild
@@ -169,7 +169,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
+		eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch"
 	fi
 
 	# remove tests that need root access
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch
new file mode 100644
index 000000000000..bd17686bd9a4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch
@@ -0,0 +1,214 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5403de8f4c..ee3336ee27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -563,7 +563,7 @@ set(BOOST_COMPONENTS
+ set(BOOST_HEADER_COMPONENTS container)
+ 
+ if(WITH_MGR)
+-	list(APPEND BOOST_COMPONENTS python)
++	list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
+ endif()
+ if(WITH_BOOST_CONTEXT)
+   list(APPEND BOOST_COMPONENTS context coroutine)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b0837ab1d9..e12cecf354 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -623,13 +623,13 @@ set(ceph_common_objs
+   $<TARGET_OBJECTS:crush_objs>)
+ set(ceph_common_deps
+   json_spirit erasure_code rt ${LIB_RESOLV}
+-  Boost::thread
+-  Boost::system
+-  Boost::regex
+-  Boost::random
+-  Boost::program_options
+-  Boost::date_time
+-  Boost::iostreams
++  boost_thread
++  boost_system
++  boost_regex
++  boost_random
++  boost_program_options
++  boost_date_time
++  boost_iostreams
+   ${BLKID_LIBRARIES}
+   ${Backtrace_LIBRARIES}
+   ${BLKIN_LIBRARIES}
+@@ -727,7 +727,7 @@ if (WITH_MGR)
+                  $<TARGET_OBJECTS:heap_profiler_objs>)
+   target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
+   target_link_libraries(ceph-mgr osdc client global-static common
+-      Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
++	  boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+   install(TARGETS ceph-mgr DESTINATION bin)
+ endif (WITH_MGR)
+ 
+@@ -901,7 +901,7 @@ set(ceph_mds_srcs
+   ceph_mds.cc)
+ add_executable(ceph-mds ${ceph_mds_srcs})
+ target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
+-  Boost::thread)
++  boost_thread)
+ install(TARGETS ceph-mds DESTINATION bin)
+ 
+ add_subdirectory(erasure-code)
+diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
+index 57cb2a5b94..971af8ebec 100644
+--- a/src/rgw/CMakeLists.txt
++++ b/src/rgw/CMakeLists.txt
+@@ -156,7 +156,7 @@ if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPE
+ endif()
+ if (WITH_RADOSGW_BEAST_FRONTEND)
+   target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING)
+-  target_link_libraries(rgw_a Boost::coroutine Boost::context)
++  target_link_libraries(rgw_a boost_coroutine boost_context)
+ endif()
+ 
+ set(radosgw_srcs
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 66e24b8bc9..0f659c98e2 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -145,7 +145,7 @@ add_executable(ceph_omapbench
+   )
+ target_link_libraries(ceph_omapbench
+   librados
+-  Boost::program_options
++  boost_program_options
+   global
+   ${BLKID_LIBRARIES}
+   ${CMAKE_DL_LIBS}
+@@ -199,7 +199,7 @@ if(${WITH_RADOSGW})
+     cls_rgw_client
+     cls_user_client
+     cls_lock_client
+-    Boost::regex
++    boost_regex
+     ${BLKID_LIBRARIES}
+     ${CURL_LIBRARIES}
+     ${EXPAT_LIBRARIES}
+@@ -229,7 +229,7 @@ if(${WITH_RADOSGW})
+     cls_rgw_client
+     cls_user_client
+     cls_lock_client
+-    Boost::regex
++    boost_regex
+     ${BLKID_LIBRARIES}
+     ${CURL_LIBRARIES}
+     ${EXPAT_LIBRARIES}
+diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
+index 9fba701e05..da3cbcfe96 100644
+--- a/src/test/bench/CMakeLists.txt
++++ b/src/test/bench/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(smalliobench_srcs
+ add_executable(ceph_smalliobench
+   ${smalliobench_srcs}
+   )
+-target_link_libraries(ceph_smalliobench librados Boost::program_options global
++target_link_libraries(ceph_smalliobench librados boost_program_options global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+ 
+ # ceph_smalliobenchrbd
+@@ -27,7 +27,7 @@ if(WITH_RBD)
+     librados
+     os
+     global
+-    Boost::program_options
++    boost_program_options
+     ${BLKID_LIBRARIES}
+     ${CMAKE_DL_LIBS}
+     )
+@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
+ add_executable(ceph_smalliobenchfs
+   ${ceph_smalliobenchfs_srcs}
+   )
+-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
++target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+ 
+ # ceph_smalliobenchdumb
+@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
+ add_executable(ceph_smalliobenchdumb
+   ${smalliobenchdumb_srcs}
+   )
+-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
++target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
+ 
+ # ceph_tpbench
+@@ -73,7 +73,7 @@ set(tpbench_srcs
+ add_executable(ceph_tpbench
+   ${tpbench_srcs}
+   )
+-target_link_libraries(ceph_tpbench librados Boost::program_options global
++target_link_libraries(ceph_tpbench librados boost_program_options global
+   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+ 
+ install(TARGETS
+diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
+index dc4e0865d0..69502342bb 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 c35ddb3d8f..3916544259 100644
+--- a/src/test/librados/CMakeLists.txt
++++ b/src/test/librados/CMakeLists.txt
+@@ -137,7 +137,7 @@ add_executable(ceph_test_rados_api_tier
+ set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS
+   ${UNITTEST_CXX_FLAGS})
+ target_link_libraries(ceph_test_rados_api_tier
+-  global rados_a ${UNITTEST_LIBS} Boost::system radostest)
++  global rados_a ${UNITTEST_LIBS} boost_system radostest)
+ 
+ # ceph_test_rados_api_snapshots
+ add_executable(ceph_test_rados_api_snapshots
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index 9f72fa3b48..665c977606 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
+ install(TARGETS ceph_radosacl DESTINATION bin)
+ 
+ add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
+-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
++target_link_libraries(ceph-osdomap-tool os global boost_program_options)
+ install(TARGETS ceph-osdomap-tool DESTINATION bin)
+ 
+ add_executable(ceph-monstore-tool
+   ceph_monstore_tool.cc
+   ../mgr/mgr_commands.cc)
+-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
++target_link_libraries(ceph-monstore-tool os global boost_program_options)
+ install(TARGETS ceph-monstore-tool DESTINATION bin)
+ install(PROGRAMS
+   ceph-monstore-update-crush.sh
+@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
+   ceph_objectstore_tool.cc
+   rebuild_mondb.cc
+   RadosDump.cc)
+-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
+ if(WITH_FUSE)
+   target_link_libraries(ceph-objectstore-tool fuse)
+ endif(WITH_FUSE)
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 233adddb7357..ef83b280404d 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -1,6 +1,7 @@
 AUX csync2.initd 492 BLAKE2B 99058d692e34d5a9b59cb33726a06b8257ba8644f44ee299fbcb71364331ec213bc229fc89f8c2d3ecd92dc4c58c2ff8a57d28f5fe04daa42ea495abeb218438 SHA512 a189bdc921efb51734e66f8df808289850c6ce5c60c797c85abb7b3063a45630261a32edced1efd23fe367e8e91e4fe69c3d5e44a10d5b95112ae990e26fa916
 AUX csync2.xinetd 388 BLAKE2B ef926697fc0ebbfa15bc764372f88f279e02e6d6f05873d43c541fd057cd659b368486147f45c8d657eec0457d41c7b2af40e580b8ccbfd94f896379031cc08c SHA512 538bb8fc5b6b667a8afd708fbb35c9b1e98967cf0c1e5b139cdd15a19305000fd7fb7eab564131eb7cf3f562ba9189b08a06061aa31ef64e8e85ca13d6f3d583
+DIST csync2-2.0-github.tar.gz 108299 BLAKE2B ec06cf1284adfe63abd6c329deb4e53474d8f97998e4e6f7f6404321a6970f783d38e9feb46c02925c947834227516d40c928a457d2b43bd2b353ab3385fd150 SHA512 7555e2d958d6213e29cfa8b3b7415eea9a9868036865c519d724ae404006d913fba4aeeb61a916d3fc95669a6ca12160d4f52dc7d15bd59403e8a7de50ee8094
 DIST csync2-2.0.tar.gz 411013 BLAKE2B b5c3da3a46168f8b9835e349a8d56070cd0e5aef3b951ba1cfe7e958f6c830336141a2d1eca6a2485d23f745b9ae907d46282aa8cc3078a60582dac8c3f286b8 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8
-EBUILD csync2-2.0-r1.ebuild 2714 BLAKE2B 165047efdc460daf5dbdbee58b3440203ef2e87bc03440c0464d510e8eab8efde1a79889a7266f289c36230f683996ae7e196ba25891b9fe79f644250016f032 SHA512 71a4c32e333b1a7ba09e05d0e5946141dfd170b0827364fdadbdac65a0a6c3909ba389c94cb3ac8729ffe8c72cf9dc004415d777e6418c5883468c179b00a8b5
+EBUILD csync2-2.0-r2.ebuild 2816 BLAKE2B bd18884898d747d2017b2c311a8fac8e79c62f4df8d54c71d2a73f1b7540892be42410e777d76fbaa948c9f5a903c07d956b059b4ed124252f4bba097908d853 SHA512 5cadc8acc48136401c6027deda5bb0c7152ee60274a0ef7803a4aa1d836372665c53e9683f7306cab34bcd0596c4e7709232256cc4005d5d2a03be4b2c18b43b
 EBUILD csync2-2.0.ebuild 2728 BLAKE2B 5af758742eef10ff811b5bc7d6fb407dbb5eba3317b685b348052b06381e5529c431aabe88374092d74a1b5334e373ecfeef470c9764cfb081c42411275a9eab SHA512 1539633ead9768601d2609c4a735c063222ba7c96da7694c023adf92828dbb0af6894c23d42df12c1f9f45311136c82a615b9722129de41cb8781d9f1b756a59
 MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/sys-cluster/csync2/csync2-2.0-r1.ebuild b/sys-cluster/csync2/csync2-2.0-r2.ebuild
index 29663af4b3f1..f66a66ac0db5 100644
--- a/sys-cluster/csync2/csync2-2.0-r1.ebuild
+++ b/sys-cluster/csync2/csync2-2.0-r2.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Cluster synchronization tool"
-HOMEPAGE="http://oss.linbit.com/csync2/"
-SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/LINBIT/csync2"
+SRC_URI="https://github.com/LINBIT/${PN}/archive/${P}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -13,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="mysql postgres sqlite ssl xinetd"
 
 RDEPEND=">=net-libs/librsync-0.9.5
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:= )
 	sqlite? ( >=dev-db/sqlite-3.0 )
 	ssl? ( >=net-libs/gnutls-2.7.3 )
@@ -24,9 +26,15 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 SLOT="0"
 
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
-		--docdir=/usr/share/doc/${P} \
 		--localstatedir=/var \
 		--sysconfdir=/etc/csync2 \
 		$(use_enable mysql) \
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 9a59272933c0..0e4fa01b82a7 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -7,6 +7,7 @@ DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51
 DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
 DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.13.2.tar.gz 28771642 BLAKE2B 4a5c5a8e0c05faab3fb6a26854e7c8643b893c2a1f5d5b56aacea869d86426dffe358222034b826d66dfd19855bee71cad7356ff483c27218019e4adda499ce7 SHA512 2f24119fc21d7bdbb60174b46da94ce3f2f6a3c638e9d96323c93c20039aeb06f9c9a3a48c43bb36b71eff25cf72967e780e3339b35ad7ad7a7a7c35662c96bd
+DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubectl-1.10.11.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
 EBUILD kubectl-1.10.12.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
@@ -17,5 +18,6 @@ EBUILD kubectl-1.12.4.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376f
 EBUILD kubectl-1.12.5.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.13.1.ebuild 1238 BLAKE2B 3ad462c2d023292f9a96a4b091f8143ee57105d1b921205e5bf82f6cd18fbf57c3c2d0a9b86637a16190969f0837fc88c23c29d8d82c159f648a9d8ccaf87730 SHA512 73730998885fe748c361d6991c0eb9703363ebdbf2db778ab7ff9333e1a9579973b7dcf0ebcb4d02fea764625f5b8e80aa8aabc38d21a8230d28b3742bc23156
 EBUILD kubectl-1.13.2.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
+EBUILD kubectl-1.13.3.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
 EBUILD kubectl-1.9.11.ebuild 1217 BLAKE2B bc8d5c0dea2db716297e051807bce2ab809dcf59d02a145221c502965993873b82d1df96dcdbed218a488b70e3241323e138817e9fcecd4e10f2d549f4c4073c SHA512 65e0bb08dec59b7f8c211766ff5aff25b0bb12819072834e2d86e768ba175b45b125b04dd0a316f47169e1ae2c9199e44d66408efeff067c8c2cbba248bb534b
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.13.3.ebuild b/sys-cluster/kubectl/kubectl-1.13.3.ebuild
new file mode 100644
index 000000000000..93cda65f0ea1
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.13.3.ebuild
@@ -0,0 +1,47 @@
+# 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 run commands against Kubernetes clusters"
+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.11
+	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
+}
+
+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/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 1a9053ef4475..981f08875963 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,6 +1,8 @@
 AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
+AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbcd54756afb857928a1d5828e79d3a54f958ddc41e8129a1489927115d1fc7712cd682699d3ac6 SHA512 3359ef337a27ea41b3db216808bb0baa571916bab37f913da79e0c9270199d75cfbb1a5730739b9207525e6027e38e8467e4c0b98567499d36130804f218e006
 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.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
 DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
@@ -9,6 +11,7 @@ DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf
 DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
 DIST kubernetes-1.12.5.tar.gz 28128559 BLAKE2B add647a579e75e877552fbde0800064d9170022619e236e9d280dc17f245adc8218458e12d0c7643a2a105c988ae7a4fa0176e19cc56989c54eb7edebd8d9dfc SHA512 bb391858b040fd75b03f5dcaf7e7f1b776d288443a833412c34c2fea8bbf23a8b76c4dd89da0b6fbd6ebfc1172407620aef8d8c5873b6f103dd118817dc17ad6
 DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
+DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8ea81239f1ce709207e321ab97c0f155c6c363b3b0f9af25f6e6ce68d99678cf2b10c841a45f082f486bd9dee7be5e3a SHA512 45c2639a88e04d16511c92ca48ca6326b12422f0765df92fb883a1afe7fda9adefcf111d76855532f69b48c6e681774ee0c7e08f74594de808b50e11f8ec52c5
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubelet-1.10.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 EBUILD kubelet-1.10.12.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
@@ -18,5 +21,6 @@ EBUILD kubelet-1.12.3.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b
 EBUILD kubelet-1.12.4.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.12.5.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.13.1.ebuild 1234 BLAKE2B 4018bb7dded556007c17c0af6f89c29d0032ee2f25309de7146dcb77cfce4ba84b9aabf79e6f54ad39826546db7ff1b1bb7822e32938a867c12d9ff203f0f5c2 SHA512 23ba4e0ec56f97d3aa2ea211f02503df8a82e1a09fcfcaf6cd1976953867bd20d50185d50b9a936d6c311e1a5e84c21abde91c25d3220607d6e1129c1f050afb
+EBUILD kubelet-1.13.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.9.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/files/kubelet.env b/sys-cluster/kubelet/files/kubelet.env
new file mode 100644
index 000000000000..a623673960ff
--- /dev/null
+++ b/sys-cluster/kubelet/files/kubelet.env
@@ -0,0 +1,17 @@
+###
+# kubernetes kubelet (minion) config
+
+# The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)
+KUBELET_ADDRESS="--address=127.0.0.1"
+
+# The port for the info server to serve on
+# KUBELET_PORT="--port=10250"
+
+# You may leave this blank to use the actual hostname
+KUBELET_HOSTNAME="--hostname-override=127.0.0.1"
+
+# Edit the kubelet.kubeconfig to have correct cluster server address
+KUBELET_KUBECONFIG=/etc/kubernetes/kubelet.kubeconfig
+
+# Add your own!
+KUBELET_ARGS="--cgroup-driver=systemd --fail-swap-on=false"
diff --git a/sys-cluster/kubelet/files/kubelet.service b/sys-cluster/kubelet/files/kubelet.service
new file mode 100644
index 000000000000..1082bbac1d0b
--- /dev/null
+++ b/sys-cluster/kubelet/files/kubelet.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=Kubernetes Kubelet Server
+Documentation=https://kubernetes.io/docs/concepts/overview/components/#kubelet https://kubernetes.io/docs/reference/generated/kubelet/
+After=docker.service
+Requires=docker.service
+
+[Service]
+WorkingDirectory=/var/lib/kubelet
+EnvironmentFile=-/etc/kubernetes/config
+EnvironmentFile=-/etc/kubernetes/kubelet
+ExecStart=/usr/bin/kubelet \
+	    $KUBE_LOGTOSTDERR \
+	    $KUBE_LOG_LEVEL \
+	    $KUBELET_KUBECONFIG \
+	    $KUBELET_ADDRESS \
+	    $KUBELET_PORT \
+	    $KUBELET_HOSTNAME \
+	    $KUBE_ALLOW_PRIV \
+	    $KUBELET_ARGS
+Restart=on-failure
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-cluster/kubelet/kubelet-1.13.3.ebuild b/sys-cluster/kubelet/kubelet-1.13.3.ebuild
new file mode 100644
index 000000000000..f38ce59e625d
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.13.3.ebuild
@@ -0,0 +1,47 @@
+# 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/legion/Manifest b/sys-cluster/legion/Manifest
index 5a19fb05ce52..e0f4239fea57 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -8,6 +8,7 @@ DIST legion-17.08.0.tar.gz 2839522 BLAKE2B b9f9d814b319c69a1e29b108c7d78fcd04f87
 DIST legion-17.10.0.tar.gz 2975023 BLAKE2B 772f666c0cd8fc96e1e460e4c8253289069eea2ed8820f091ad517228fb7b2d56bc8bedbe9bc4d5776869fc4f0250f71644bf773362f65a0bba6f96be51c32af SHA512 c4be9b32b47b3c4ae38374606125867f963a109dd542a52ee20b2964e5849121207d78947f0ab6ea4ed5e8a027b26da7b1a3a61124f175c1b9f7323e56b8d9b2
 DIST legion-18.02.0.tar.gz 2967232 BLAKE2B 5f22efe681ee036af95b3d84c104988acfea899b76684860c1a27dda27b757c7a444ea5c1cec70ce0a19ffaa8323c208997402971017f72415a12ff9aabadea5 SHA512 052026c6f7e3920bfe097ada83571e4f7d4ad74a59d4a84af4d35f089c5d1b216e90f4f8547ea894e4b53b138b81e594c60342c41557c985b64d08c4aca23794
 DIST legion-18.05.0.tar.gz 3009091 BLAKE2B 86c113cad11e2fbdcf03233c09fe429ceff12aaac6621e0ae22ac141cf7a6c62f7df23f78861a826ba55a45c3eae46ca60b9e47339f9ed3333560797733b7d4e SHA512 f7000b5a6b66d07d72de9be7ef0bcdfd7aa95f838bfc1ccb4b146cf0c4407682a5cde75b56311bb07abd808dc67527e02a3a3db10bca874028a7335b54e1120a
+DIST legion-18.12.0.tar.gz 3138868 BLAKE2B c85faf51eb528085f05a5e3411253f0ceb4ef6c6252466861d5641bd2df8320738d3cfd864781c05986038ed84cb6bec95d889f3d4d1ef8b25d90f2d339a9300 SHA512 26fc5d0fe1743de3e634fa3c2d95c3758b21bba7a1e1eb66c4c69d43d0d557b595b691b1bcd091f2c23ea034f000491ea6d5d81da94fb531781462e3093a202d
 EBUILD legion-16.08.0-r1.ebuild 842 BLAKE2B 30bb3223528dde61a00ad56dc5f2c1d80c9d70139f83215eaae9d459af87530629cf3672f2773f0a79eb785558491875c888b12c2bf5ceac3ba055914e7b6a41 SHA512 d3d0f07e5028c88a288ec07b40cd06c336319405421ece8abc66a8606cfc8ae48e16636462c377dba2fc09afe29a013f6782cf2e3894c24dcfac5847cbd26166
 EBUILD legion-16.10.0.ebuild 669 BLAKE2B 38e26a3fd282a1e8cb903b60ed4765abf0ff65dfd43d9e799b06b538f8b67727f2dabc3f7a881593a540447783d2d85a1c134dab77a2d21c6a75d9ab41ad8319 SHA512 599658544d58e5df36506abd5fb05fef69bccac29668714c203d48fd5902127fa6a73cb3284b798569e9402cb921d5db5f766bc2a69edb6558837f55262385df
 EBUILD legion-17.02.0.ebuild 724 BLAKE2B 984269660b686c332be9fed32d491ec128252c45ea21da8baeb32d2bf7ff77a940983556de253efc3977757044da20154414fbfab35c034dd5fb9c40f2cf7423 SHA512 ecb3a77330e40a0abee5af0bbc5a7ecf0fc7baad53f077eea9975f22b165c68ad999111f3c01bdc9e8df92c57ce3ac658817b7be4b96429c2fe67c8782671c98
@@ -15,6 +16,7 @@ EBUILD legion-17.05.0.ebuild 881 BLAKE2B 5882193463db2b6126b4835bb67b4df74563d87
 EBUILD legion-17.08.0.ebuild 925 BLAKE2B 2b6d9b020f6a91491cc80771f3d99fe96481fd2096a13f7e9185accf37dfdd20bfdcec7fd0144de29c33dd411da52919e4e3f6b7631f4653a3c24e3872d7728a SHA512 fd399c48fe6e4209c1d5a1cb8ea8a2d9af507268784c009143aa67fefe3f8a9f5fce81b3231e0b2390bf049f410372928c59e211def52cb0303fa49647964538
 EBUILD legion-17.10.0.ebuild 925 BLAKE2B 2b6d9b020f6a91491cc80771f3d99fe96481fd2096a13f7e9185accf37dfdd20bfdcec7fd0144de29c33dd411da52919e4e3f6b7631f4653a3c24e3872d7728a SHA512 fd399c48fe6e4209c1d5a1cb8ea8a2d9af507268784c009143aa67fefe3f8a9f5fce81b3231e0b2390bf049f410372928c59e211def52cb0303fa49647964538
 EBUILD legion-18.02.0.ebuild 925 BLAKE2B baf2b2e205ee24d7fa6e1d964e448f6302174e92ed31b606c705475d9a85a40baec0affab6a66acab2aa24d32512a8d97c4f000f155d1b6508ec30883c5bc904 SHA512 174c759e15aee5c84fddb8367d147a408c3a0ca4cb10e747f24bbe4c17059b0302a3b16227822099f47ea12db265b153f9825f34a3914062706adfb3ee363f2a
-EBUILD legion-18.05.0.ebuild 925 BLAKE2B baf2b2e205ee24d7fa6e1d964e448f6302174e92ed31b606c705475d9a85a40baec0affab6a66acab2aa24d32512a8d97c4f000f155d1b6508ec30883c5bc904 SHA512 174c759e15aee5c84fddb8367d147a408c3a0ca4cb10e747f24bbe4c17059b0302a3b16227822099f47ea12db265b153f9825f34a3914062706adfb3ee363f2a
-EBUILD legion-9999.ebuild 881 BLAKE2B 5882193463db2b6126b4835bb67b4df74563d871f155ba1ae684c29a385c08fe29cbead6f8b5081bd5a0d06e1a43fb194769bd56271250b47788ab14dd2577e1 SHA512 8976cb8040a1ad4a205900ee6d040029c54c1cf802a70d83fc52b63190bd8405d1f0107f4a0a9e5a3cb9ba37a9e2446a4f7a2b84587ba33b83d60d2dfea9c01f
-MISC metadata.xml 602 BLAKE2B 9ee024fb164e9f46cf363d0d61a7f5fb8d34987c2f81fd5929050a9f1ae87442072137d2a8ebb2b1ed373cd4a0888e105faf46eaee91853f61b66a024e68db4a SHA512 ec6acaf029c0909ea54e7548c50fbcf5b1796081c9e774dcdaf6cd9ebfb9f67110be68b88208dcb1dd59cc9b4c7efc16ab5cf740a81ba2c61cc3b568b4648ac1
+EBUILD legion-18.05.0.ebuild 925 BLAKE2B a0591e3810c6a0bd76bf0ef9d3367bbe0e64518df15451cf26f9f9d716bf074e1020e2f03dfd265b363f917ea2b9878cc011839719d45f567f0b4ecd4f3fb0c8 SHA512 d0d4f3b47300dc4bd30acdcd8b7768fa03a75646377937372726bd6a3a0df0e608907714f08c5582382549f6fa4d8c878011c45cbfb4a515bf00252e4de6f6a0
+EBUILD legion-18.12.0.ebuild 925 BLAKE2B a0591e3810c6a0bd76bf0ef9d3367bbe0e64518df15451cf26f9f9d716bf074e1020e2f03dfd265b363f917ea2b9878cc011839719d45f567f0b4ecd4f3fb0c8 SHA512 d0d4f3b47300dc4bd30acdcd8b7768fa03a75646377937372726bd6a3a0df0e608907714f08c5582382549f6fa4d8c878011c45cbfb4a515bf00252e4de6f6a0
+EBUILD legion-9999.ebuild 925 BLAKE2B a0591e3810c6a0bd76bf0ef9d3367bbe0e64518df15451cf26f9f9d716bf074e1020e2f03dfd265b363f917ea2b9878cc011839719d45f567f0b4ecd4f3fb0c8 SHA512 d0d4f3b47300dc4bd30acdcd8b7768fa03a75646377937372726bd6a3a0df0e608907714f08c5582382549f6fa4d8c878011c45cbfb4a515bf00252e4de6f6a0
+MISC metadata.xml 482 BLAKE2B 7e3a7dbb680ebe09062916b1c5205f3f29ecff8ffe003e9b8e6675838fed668e6468f06a6dc26f3a5c307c77105cfb911f01c23f795140f3c5d99c13811aeb1d SHA512 bc28b76e1b0479d70e2db624340097739337c8be35dd16e8ed2ef71444a0a18c579a296c65a0bbc679dd1c8a86f29eb423e9e8cca93da78f9fbea28f537da3d4
diff --git a/sys-cluster/legion/legion-18.05.0.ebuild b/sys-cluster/legion/legion-18.05.0.ebuild
index 51357e884176..c52bb9263a68 100644
--- a/sys-cluster/legion/legion-18.05.0.ebuild
+++ b/sys-cluster/legion/legion-18.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ IUSE="gasnet +hwloc test"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( <sys-apps/hwloc-2 )
 	"
 
 src_configure() {
diff --git a/sys-cluster/legion/legion-18.12.0.ebuild b/sys-cluster/legion/legion-18.12.0.ebuild
new file mode 100644
index 000000000000..c52bb9263a68
--- /dev/null
+++ b/sys-cluster/legion/legion-18.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A data-centric parallel programming system"
+HOMEPAGE="http://legion.stanford.edu/"
+if [[ $PV = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gasnet +hwloc test"
+
+DEPEND="
+	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
+	hwloc? ( <sys-apps/hwloc-2 )
+	"
+
+src_configure() {
+	mycmakeargs=(
+		-DLegion_USE_HWLOC=$(usex hwloc)
+		-DLegion_USE_GASNet=$(usex gasnet)
+		-DLegion_ENABLE_TESTING=$(usex test)
+		-DBUILD_SHARED_LIBS=ON
+		-DLegion_BUILD_EXAMPLES=ON
+		-DLegion_BUILD_TESTS=ON
+		-DLegion_BUILD_TUTORIAL=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/sys-cluster/legion/legion-9999.ebuild b/sys-cluster/legion/legion-9999.ebuild
index 443814e2abdd..c52bb9263a68 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,17 +19,18 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="gasnet +hwloc"
+IUSE="gasnet +hwloc test"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( <sys-apps/hwloc-2 )
 	"
 
 src_configure() {
 	mycmakeargs=(
 		-DLegion_USE_HWLOC=$(usex hwloc)
 		-DLegion_USE_GASNet=$(usex gasnet)
+		-DLegion_ENABLE_TESTING=$(usex test)
 		-DBUILD_SHARED_LIBS=ON
 		-DLegion_BUILD_EXAMPLES=ON
 		-DLegion_BUILD_TESTS=ON
diff --git a/sys-cluster/legion/metadata.xml b/sys-cluster/legion/metadata.xml
index 15e1c0385f6f..54d1cf1a5f0d 100644
--- a/sys-cluster/legion/metadata.xml
+++ b/sys-cluster/legion/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>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
   <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index 641e1c7905a1..c7abd35da5a4 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1,6 +1,4 @@
 AUX disable_create_run_dir.patch 632 BLAKE2B 9b4c817cbf77de4b33063f42d832f729542da24cbd9c8c495f5383562e1228322e3c41321f4c2f09b9745dfc56420c74cc94dc380a7780d01dbd71a1f5a04d99 SHA512 4ef81f24a21f200881f2ff94ba9d39f1b097362eb371623a62dc7d66c7e174e3e7a465be85856c7c5ca8a01d8fe725bd9d713f871af8cec3c25bc94811d7c415
-DIST ploop-1.13.2.tar.bz2 122821 BLAKE2B f71174ae9eba00c00714faa760abb356bf4fa5ede48cdb2366ef685f703f58950d0e49d65634eaca05529289666c548c93e7d526929e3ae51814b0ccc8736cdf SHA512 85a3314dc1114b692cd98290412fd2ea78c516964c712487dd72f8347fd583172d8836f997d63ccade89ee39be031669074d9bc957926b97175e659ec505ddfb
 DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
-EBUILD ploop-1.13.2.ebuild 1358 BLAKE2B 937013bc3128d5c8f8cd9b856645271370659dfcf87c881a3f2966cd284e4fb92d6f6550187ab7a2200a2ce07998de6b5e065f6e4af0579070b11d3c5a98d58f SHA512 230ada0afffd5282bc67139d3fb7a3b22a45a42fe0e361c170765e6c139c437d37e336c2de8f05a7ccc62b23cbec619905b7072490c8eb894e5905b9278ea759
-EBUILD ploop-1.14.1.ebuild 1412 BLAKE2B a6e95a8955c218d42b08b477a347341f1f463059854f0622618e35a31285f8effaae452de425a775a4dfc807a91503d54370483856a7fc7b073d78e96b7ea045 SHA512 4b217a9f2e44331b04bdd2edcc69fe8567dd57de1b8d87d6d8a2094727863c6b0f7d493dbd15b651acec6d4ef53281fed1285b35b2f3d1ef1c952a5712caac29
+EBUILD ploop-1.14.1.ebuild 1407 BLAKE2B dc7a9d264b26cc186b324f8cccf125fac8859a3d6a6e670e0a274278b11e51a5bc917daa641a0edaabaefd999dd73ab5bb35a26c6b85a9ca9c33b46329fcc7b3 SHA512 12f92b7f53d240b3ec801c5260169ba77e851a4d751bbc88a467bd320c5e05dc1560f09f5f605bb69d869caf20625463e07bc62054a1ad13f2a90c81bb87aa54
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-cluster/ploop/ploop-1.13.2.ebuild b/sys-cluster/ploop/ploop-1.13.2.ebuild
deleted file mode 100644
index e0953461d6cf..000000000000
--- a/sys-cluster/ploop/ploop-1.13.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib systemd
-
-DESCRIPTION="openvz tool and a library to control ploop block devices"
-HOMEPAGE="https://wiki.openvz.org/Download/ploop"
-SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug static-libs"
-
-DEPEND="
-	dev-libs/libxml2
-	virtual/pkgconfig
-	"
-
-RDEPEND="dev-libs/libxml2
-	!<sys-cluster/vzctl-4.8
-	sys-block/parted
-	sys-fs/e2fsprogs
-	sys-process/lsof
-	sys-apps/findutils
-	"
-
-DOCS=( tools/README )
-
-src_prepare() {
-	# Respect CFLAGS and CC, do not add debug by default
-	sed -i \
-		-e 's|CFLAGS =|CFLAGS +=|' \
-		-e '/CFLAGS/s/-g -O0 //' \
-		-e '/CFLAGS/s/-O2//' \
-		-e 's|CC=|CC?=|' \
-		-e 's/-Werror//' \
-		-e '/DEBUG=yes/d' \
-		-e '/LOCKDIR/s/var/run/' \
-		Makefile.inc || die 'sed on Makefile.inc failed'
-	# Avoid striping of binaries
-	sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
-
-	# respect AR and RANLIB, bug #452092
-	tc-export AR RANLIB
-	sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '')
-}
-
-src_install() {
-	default
-	ldconfig -n "${D}/usr/$(get_libdir)/" || die
-}
diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
index e8529be645c8..adb736dd7bd0 100644
--- a/sys-cluster/ploop/ploop-1.14.1.ebuild
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug static-libs"
 
 DEPEND="
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 4ced44c7ac22..4180128b0f07 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -2,6 +2,6 @@ AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802f
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.4.0.tar.xz 157016 BLAKE2B 9d588214d260b88cfa3978e831bcd8086ae80aafc1a04b616274da141140a22c2765083632f29402cdae67cdbbdfcefdaff1539e5d45485c6f271e3ee7f6471a SHA512 8a10faaa5b9ce9f0506ca16620ad482804c9ca860b84a60a6f0b525a256059229a202163d366a57fb59169c0f4f822ced570b42562e412747f6f716509341f19
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
-EBUILD sanlock-3.4.0-r1.ebuild 2096 BLAKE2B c6c12a9cdb99d5189158fbf336c61745740e830d94688b60de1d3dcc04a702503fdd5195c5f28d6755e02d875641b4320d5add2a025a15e941883a98f1f3b1e6 SHA512 d346383b90da585faf2b681db960e0b47ed3b444fec6bc582b8d8b4806832ad6a7ecf0a4fa942dd61677097a61b93971b5e43f3983a87d5f400c3491594b5790
-EBUILD sanlock-3.6.0.ebuild 2077 BLAKE2B 387dc7aced94052f625e5bd4676ea4862430c55ff18deb39c7fe5eb5da3ff1897e6c8e9e719bfa76d8f867110e14cd4a3100e6009492f538e64d2479927f7fd0 SHA512 ceadb102f9748192c0e3522dd91c0a55d00c7f511c1f745af97c70c4ba4d20d12177a27b1c0eb572894391dc5264dc222dfd2d56b6a7ab74f4dd69279a84b8c9
+EBUILD sanlock-3.4.0-r1.ebuild 2103 BLAKE2B 2e4c00ef232d4711d6229cb39839f0d4728e31d2117502470e83909d57e3bf6f9e9b710e83274b5addce6779c2fe6095967e2ba336b4984384483dde832909c9 SHA512 92bc7470371a63bca5a1d2a8b2ded9b75821b996c78ba43f52e0a0b18102d75aa85f6fa6264ce0e59f90bd500ad590e1d9de33931fa5f8f209f12b4294190063
+EBUILD sanlock-3.6.0.ebuild 2084 BLAKE2B 046fbbb1fd82b78db777ad92dc1be6facbbceaec7e8c7cdeed899c519f895f5904faf0042fc1c66793bdd9e82e4fdb31b8b14aff652a37156bed803bdf6e33ba SHA512 68fb7b4d90b12cb4cd4c27bff9e38dc2f11507b9390348041a11b3d42fdb9f5833b2683c467e1b3383ca1233850918863852259709cbf65737a2076f53c65063
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
index e40ef316db5d..9d6a69014f5f 100644
--- a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${P}.tar.xz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/sanlock/sanlock-3.6.0.ebuild b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
index a2ff725e30e2..b428c4943470 100644
--- a/sys-cluster/sanlock/sanlock-3.6.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"