gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /sys-cluster
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
41 files changed, 323 insertions, 2409 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index cd4dd0f17856..553b9ba0dcbc 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index bdab5701e8f4..77c269ab4284 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -46,24 +46,14 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537
 DIST ceph-10.2.3.tar.gz 11596171 BLAKE2B c24c879649f0d42f58cfb1d03701797bc685d83c157031156d13308c731412a4a0149b658193722b358ebf0c4f9760d9664668cd797b69d207e81dc572f49700 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19
-DIST ceph-12.2.10.tar.gz 78884870 BLAKE2B 321d8256fc6659be3da2ce348e022e79ded63783925c02d3140ffa7fed5528a2b03388f0dfcdf536c81eec7b2484c6db9def8aefb1d5d335c86bad525977977b SHA512 2195a04bf937dba6af61389132240661126ef32e9fd86ca75af27a33c712053b15aa89b52c91ced04f06dc880d7c018afa3f26fff78bf313603f4fb73331b80c
 DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef
-DIST ceph-12.2.7.tar.gz 78783279 BLAKE2B 9058a5e408b3431cf0e8c28b44f95f6eb12f029697348eb6879efa9db4ad6a3b52b1040f484919a3f1781ac3a4aa72af3b8905760480fd3f3724dbceeab4eb07 SHA512 dde75a41c31cca54d4a680b0b93e28680a23f912a348cccca65e55e600c315bbfe3ced008d758fe8ba1e801a9d6e5f8079cc157ec5eef8916b86f487f42064ea
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
-DIST ceph-12.2.9.tar.gz 77300470 BLAKE2B 3d3fe24986b890e7dcfc790441a80ad56b9c26f500811d524d0889773d425c88f278135d85cd84036973deb5aa58c4cd1cc9cead60db3f0f825349d73140be73 SHA512 93da6f9012fdb65e74dc1917f54839cb19a25672d53e7ee253553e93abb1a2afb51cd18b27bc82559108e2085e463a3b46003b03627e06a6e2e2312b54d86e92
-DIST ceph-13.2.1-frontend-node-modules.tar.xz 44352460 BLAKE2B 0a0099e60f0b36d48928dcda3f69dbb00e14a9a9e10c688ecbeb3daa3adbe339655652a43924043fe140ce1754525be2abed61f1ad5f24779fa4ff890d2b7cf6 SHA512 3938e8cadb6385cdaf023fe55ab5f202e44ed80173b128e3b76fc4849556cea90ce5d8884a928b93776b0509b5aef814f1078ba5e44a9d644b43a871aea06dd9
-DIST ceph-13.2.1.tar.gz 90786830 BLAKE2B e0884a039ff0e8a1705d8f31f4dcf4cd8ab8989d7c2fa703417038ff9a6cf7b0fbca09abceb901970fbb2dd9a1dc87c2500fec38a2bfca86a9a6dcaab15be991 SHA512 411218ea6037bdf9425a741720ea89876e893e64fbfa518c9584ba581f805fde2c82b13ed47313279665e5d20f36223fc8d5c27055b580c72b22c2004e4da81b
-DIST ceph-13.2.2-frontend-node-modules.tar.xz 45100632 BLAKE2B c3929a6c5e6ec3da5ff60967ae40b99377b2186f31e64af571d9be14889d90bc48b570489aea300ead8e99afc0e62db4438cf343686757a39d84889e772c7fa9 SHA512 93eabc2010c0977c2980c739e131d231a809e375c42120e81effc6cecdeaf0e50b4f8c88286993ef60f1ffaede94f637475104e09fd7af58a289350bd670bf2f
-DIST ceph-13.2.2.tar.gz 90840817 BLAKE2B db5933f358a1ae6888030bca7522e20545a2e107055dca44b371e295537c854568682fa558d3f90193e0dfe618947918ce21816b5e20795fff8a14bc837216bb SHA512 37c4845ae52550428c7f1e0d77d9d671ea1d6f5cad5bce0713dce97b54f3abe7346daa2cbd44b76638fb74fe7bdc4797033a4bf808253cfc8bec0fa495ec7e03
 DIST ceph-13.2.4.tar.gz 90910119 BLAKE2B eb395f435552d91789869bd92fee2a8b2fef155205f13b118bd01be4ff78a8e1dde682425a24311822bb819ec8cf41a9d45245ffa3cb7a921d3269f6658bf920 SHA512 5055979067234ad7fd2774007d524ef4643d968bf7ce42fc8c3f8e469fd84cbd7afc163cd6ddda53584bd5677fdea2fecf8194a378d49724504f639b9f688ff7
+DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 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 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
-EBUILD ceph-13.2.1-r1.ebuild 9212 BLAKE2B dc1bad7c2e864edcd301097937894aa58abbadbcee9b2cd6d33b10c2366ac5bc9000460465910bf72b8c30a60b74a6be8ccc7591c1b9ddbc912182dd4dc4179f SHA512 365777bb2ebff564a503a6816e257c95ef0e3414f274b9613acb561d5744738b43aebb8488e09da5d230ee59e02003dc560f6216531dbb04c6c6a172475f011d
-EBUILD ceph-13.2.2-r3.ebuild 9936 BLAKE2B 6229c6c6bb2d188159c4988f50a3803f9c1f98a363fca8d1e1d2994f3a25e8b8e07fe21789381a597047b7e6b69c3951d7d10a4d0a0fd1d7b8808d018b44aaea SHA512 c7898b7a57a243a79d0150dafbcb8cb0bcafadc1c8960c8117b046c43092bce8970bad8572e2b9ea286c7a18cac652a0bd2e784efeb80f290034470eff40d0e9
-EBUILD ceph-13.2.4.ebuild 8535 BLAKE2B 8b6971d021c445bcf6f832e183f8b7b07cae1f27a257e7f00d49c94beb713af0a42b2682a0cfd0c337d3c59d35ad405b809d44267e821fb5cd147092f56d8e80 SHA512 37ad5ebc22663730a445c543d99028f107225d396d15e8781f9993734388d3aaf324453f90357b46817c431d3ba17ce073ff056d285b6abe0946423f055e5985
-MISC metadata.xml 1730 BLAKE2B 0cf24323ef1e88d95e448ecaa2df8a4b2a1ac9baf3f433931cd588bdb34b2f268a280a0756402787c73e4ac33dceb60042bafee1d3124dc6e98ba33abc541c73 SHA512 e54693fd32f6ecc16ca244067ce1ebf63ea5939926be2466a9d88a5373b25651bb5c25984ee6dbeecf0099be0988f002ed824b874c5a308fd4fbe35b87dcb53a
+EBUILD ceph-13.2.4.ebuild 8477 BLAKE2B bea9b2dd3544c7e6dcba8ef5afd32f6ab3808ef2f4ee5be118fcc65945323bd69583f02bb975e3fa1f5afe1c6732aad240792ab181678a5eb1229e166e8d5a40 SHA512 4097632dbd821352822c23c4d65eacfc1cf9ece17514d2a18ae7127540e0fc8ba9236a93039896e5562e1244ee81acde5d252cb06be2c15afa554bc9710693d8
+EBUILD ceph-13.2.5.ebuild 8477 BLAKE2B bea9b2dd3544c7e6dcba8ef5afd32f6ab3808ef2f4ee5be118fcc65945323bd69583f02bb975e3fa1f5afe1c6732aad240792ab181678a5eb1229e166e8d5a40 SHA512 4097632dbd821352822c23c4d65eacfc1cf9ece17514d2a18ae7127540e0fc8ba9236a93039896e5562e1244ee81acde5d252cb06be2c15afa554bc9710693d8
+MISC metadata.xml 1604 BLAKE2B 46a4c3d77a2c1a0863f15b509d6889462b8506dfc43fe75c233da5bf0658faeacf396229b6277b818d4d0b51183d3ef21009a11b9213adf1459d9fb46eb9e05f SHA512 7636cd12abd1d7c8e7b473c4019903e2eb29d18c829e045c55244dc7b311bace931bc8d6fa55ce5ab5d6e3d1b7f020d76884c2d3a625dcb4d9a92c5c65c1522a
diff --git a/sys-cluster/ceph/ceph-12.2.10.ebuild b/sys-cluster/ceph/ceph-12.2.10.ebuild
deleted file mode 100644
index 58e624596ede..000000000000
--- a/sys-cluster/ceph/ceph-12.2.10.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Copyright 2017-2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	<dev-libs/crypto++-7.0:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	nss? ( dev-libs/nss:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( <dev-libs/openssl-1.1:=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		<dev-libs/openssl-1.1:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
-	)
-	system-boost? (
-		=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/e2fsprogs
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	?? ( ssl nss )
-	?? ( jemalloc tcmalloc )
-	"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-12.2.4-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python2*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_NSS=$(usex nss)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-
-	ceph_src_configure
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${D}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r1 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r10" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-12.2.7.ebuild b/sys-cluster/ceph/ceph-12.2.7.ebuild
deleted file mode 100644
index 75cd704ac78f..000000000000
--- a/sys-cluster/ceph/ceph-12.2.7.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	<dev-libs/crypto++-7.0:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	nss? ( dev-libs/nss:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		dev-libs/openssl:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
-	)
-	system-boost? (
-		>=dev-libs/boost-1.66:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	?? ( ssl nss )
-	?? ( jemalloc tcmalloc )
-	"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-12.2.4-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python2*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_NSS=$(usex nss)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-
-	ceph_src_configure
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${D}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-12.2.9-r1.ebuild b/sys-cluster/ceph/ceph-12.2.9-r1.ebuild
deleted file mode 100644
index 553f7fd82c80..000000000000
--- a/sys-cluster/ceph/ceph-12.2.9-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Copyright 2017-2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	<dev-libs/crypto++-7.0:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	nss? ( dev-libs/nss:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		dev-libs/openssl:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
-	)
-	system-boost? (
-		=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/e2fsprogs
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	?? ( ssl nss )
-	?? ( jemalloc tcmalloc )
-	"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-12.2.4-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python2*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_NSS=$(usex nss)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-
-	ceph_src_configure
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${D}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r1 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-13.2.2-r3.ebuild b/sys-cluster/ceph/ceph-13.2.2-r3.ebuild
deleted file mode 100644
index 12a47de10f3b..000000000000
--- a/sys-cluster/ceph/ceph-13.2.2-r3.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Copyright 2017-2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz
-		mgr-frontend? ( mirror://gentoo/${P}-frontend-node-modules.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend"
-IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
-IUSE+=" xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	mgr? (
-		<net-libs/nodejs-9.0
-		>net-libs/nodejs-8.10
-	)
-	mgr-frontend? ( net-libs/nodejs[npm] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		dev-libs/openssl:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
-	)
-	system-boost? (
-		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	mgr-frontend? ( mgr || ( $(python_gen_useflags 'python2*') ) )
-	?? ( jemalloc tcmalloc )
-	"
-
-# building npm stuff is currently broken
-REQUIRED_USE="!mgr-frontend"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	if use cephfs; then
-		eerror "Cephfs support is broken in 13.2.2, please mask ${PF} if"
-		eerror "you need cephfs support: "
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		eerror
-		eerror "See https://bugs.gentoo.org/670592 for more information"
-		die "CephFS support is currently broken"
-	fi
-
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=$(usex mgr-frontend)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	rm -r "${BUILD_DIR}/lib/cython_modules" || die
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	if use mgr-frontend; then
-		# npm likes trying to create /etc/npm
-		addpredict /etc/npm
-
-		# subshell to avoid polluting the environment
-		(
-			python_setup 'python2*'
-
-			export CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-			set -e
-
-			pushd src/pybind/mgr/dashboard/frontend >/dev/null
-
-			npm install --offline --no-save --verbose --parseable \
-				--no-rollback --no-progress --fetch-retries=0 \
-				--nodedir="/usr/include/node" \
-				--cache="${WORKDIR}/${P}-npm-cache" \
-				--registry="http://npmjs.invalid" \
-				--sass-binary-site="http://sass.invalid"
-
-			# this tends to get installed to the system if it's still here
-			rm -rf node_modules/node-sass/build
-
-			popd >/dev/null
-
-		) || die "failed to build node modules for mgr-frontend"
-	fi
-
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r10" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-13.2.4.ebuild b/sys-cluster/ceph/ceph-13.2.4.ebuild
index 52ab54eb408b..cca90b166f05 100644
--- a/sys-cluster/ceph/ceph-13.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.4.ebuild
@@ -57,10 +57,6 @@ COMMON_DEPEND="
 	ssl? ( dev-libs/openssl:=[static-libs?] )
 	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
 	zfs? ( sys-fs/zfs:=[static-libs?] )
-	mgr? (
-		<net-libs/nodejs-9.0
-		>net-libs/nodejs-8.10
-	)
 	radosgw? (
 		dev-libs/expat:=[static-libs?]
 		dev-libs/openssl:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-13.2.1-r1.ebuild b/sys-cluster/ceph/ceph-13.2.5.ebuild
index bcb39ab07713..cca90b166f05 100644
--- a/sys-cluster/ceph/ceph-13.2.1-r1.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 DISTUTILS_OPTIONAL=1
 
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 toolchain-funcs systemd
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
+		systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
 	SRC_URI=""
 else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz
-		mgr-frontend? ( mirror://gentoo/${P}-frontend-node-modules.tar.xz )"
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -26,7 +26,7 @@ SLOT="0"
 
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend"
+IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr"
 IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
 IUSE+=" xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
@@ -57,11 +57,6 @@ COMMON_DEPEND="
 	ssl? ( dev-libs/openssl:=[static-libs?] )
 	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
 	zfs? ( sys-fs/zfs:=[static-libs?] )
-	mgr? (
-		<net-libs/nodejs-9.0
-		>net-libs/nodejs-8.10
-	)
-	mgr-frontend? ( net-libs/nodejs[npm] )
 	radosgw? (
 		dev-libs/expat:=[static-libs?]
 		dev-libs/openssl:=[static-libs?]
@@ -113,13 +108,10 @@ RDEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python3*') )
-	mgr-frontend? ( mgr || ( $(python_gen_useflags 'python2*') ) )
 	?? ( jemalloc tcmalloc )
 	"
 
-# currently does not configure without the mgr
-REQUIRED_USE+=" mgr"
-
+# the tests need root access
 RESTRICT="test? ( userpriv )"
 
 # distribution tarball does not include everything needed for tests
@@ -143,6 +135,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
 	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
 	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
 )
 
 check-reqs_export_vars() {
@@ -181,6 +174,9 @@ src_prepare() {
 		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
 	fi
 
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
 	# remove tests that need root access
 	rm src/test/cli/ceph-authtool/cap*.t || die
 
@@ -196,7 +192,7 @@ ceph_src_configure() {
 		-DWITH_FUSE=$(usex fuse)
 		-DWITH_LTTNG=$(usex lttng)
 		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=$(usex mgr-frontend)
+		-DWITH_MGR_DASHBOARD_FRONTEND=NO
 		-DWITH_OPENLDAP=$(usex ldap)
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_SSL=$(usex ssl)
@@ -211,6 +207,9 @@ ceph_src_configure() {
 		-DWITH_RDMA=no
 		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
 		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
 	)
 	if use amd64 || use x86; then
 		for flag in ${CPU_FLAGS_X86[@]}; do
@@ -248,35 +247,6 @@ python_compile() {
 }
 
 src_compile() {
-	if use mgr-frontend; then
-		# npm likes trying to create /etc/npm
-		addpredict /etc/npm
-
-		# subshell to avoid polluting the environment
-		(
-			python_setup 'python2*'
-
-			export CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-			set -e
-
-			pushd src/pybind/mgr/dashboard/frontend >/dev/null
-
-			npm install --offline --no-save --verbose --parseable \
-				--no-rollback --no-progress --fetch-retries=0 \
-				--nodedir="/usr/include/node" \
-				--cache="${WORKDIR}/${P}-npm-cache" \
-				--registry="http://npmjs.invalid" \
-				--sass-binary-site="http://sass.invalid"
-
-			# this tends to get installed to the system if it's still here
-			rm -rf node_modules/node-sass/build
-
-			popd >/dev/null
-
-		) || die "failed to build node modules for mgr-frontend"
-	fi
-
 	cmake-utils_src_make VERBOSE=1 all
 
 	# we have to do this here to prevent from building everything multiple times
@@ -305,15 +275,15 @@ src_install() {
 	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
 
 	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
 
 	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
 
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
 
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}"/sysctld 90-${PN}.conf
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 9e6dc1edfa56..a483dc67c04b 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -26,7 +26,6 @@
     <flag name="libaio">Use libaio as asynchronous input/output library</flag>
     <flag name="lttng">Add support for LTTng</flag>
     <flag name="mgr">Build the ceph-mgr daemon</flag>
-    <flag name="mgr-frontend">Build the mgr/dashboard frontend with npm, this is not required for the frontend to work</flag>
     <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
     <flag name="radosgw">Add radosgw support</flag>
     <flag name="system-boost">Use system <pkg>dev-libs/boost</pkg> instead of the bundled one</flag>
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 1fc1df47c030..5f31065ce050 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -3,9 +3,7 @@ AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fe
 DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77 SHA512 10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
 DIST cinder-11.2.0.tar.gz 5832600 BLAKE2B 3d06bef947ffd8b38bb178de79f592b678793bb53ccec23d2b46132d78180d58aa11ea760c9ad5d3923d32452c700aeb6e097d84261e86bdce79d34bff1c2402 SHA512 4ef77c0d0423286d1ce2aa1174b65b17999819f719f061811c24f277e41b8463bf4971982c4d9f5e085aac75fcd964353ae26bcf7b395023a0aa37e964000014
 DIST cinder-12.0.5.tar.gz 5358388 BLAKE2B 7ee078eb4cc4c4b16053453f1f3e5bd37c29766f80bedd1b3fe6e9d44387c8215d0fed1f79d92576254bf51b567227193a7175db7d06ef35d7f3fff5d82dd4da SHA512 80788d2b10a4a0bf83e61db8e58f54dd8bbcd9fa06cd4025d37809f310bc7ed148ea9c180f4e6f02cf06f8b388384cbb9cb8a8f29a327acfe8188503550a7097
-DIST cinder-13.0.2.tar.gz 5463591 BLAKE2B d146e43bdd97bd15aeaf7c582c8cbe37080a7a1e8b5090c2727fb2dfbfc953121c0bb4c2adfce5f09d3e43e02093335dcce655dcc64abfa98d58b08327257950 SHA512 04ea9c0dafcc98858b587bf94e5afa20cfbfdd1aebd615ac62cfc7821a8dc6106b695071d68dc369bff014e877fc188216f3b05a9a08ea94a1b99712eca25c92
 DIST cinder-13.0.3.tar.gz 5464871 BLAKE2B 3d2beebe7503d673ebc8a3f6b07da2a6799d276578823cb1abb518894f88cf97ec051337016b177ddc45614d70b9a5350a49c144011b0d1e41beaf901b4a73da SHA512 2e358f7f0220aa6b6b88dedc8c942abcf5c54c53a690d18d84bee6d63b4f28b75c463f1d37a5e24925431e441f26066dbb0b4d33750429efbe7663d0e69de3a4
-DIST cinder.conf.sample-13.0.2 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-13.0.3 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
@@ -13,8 +11,7 @@ DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff
 EBUILD cinder-11.1.1.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-11.2.0.ebuild 7747 BLAKE2B c00bf247b5500ebbf92de7b6c972d0cdb46bcd4f1bad37d472980c49aa78e079fb0ff0b1f38c4c6caea809a3674591426cb22f7211a2a8d3281a8e885fa8bcce SHA512 5f1dfbc83e16d31ba75128fb5973b3e5f0f4de4fa7e1a96ac7873692af37991353109064437d31e23dd4fbb558ebe12a17675af8e1635960099a86607c0fc851
 EBUILD cinder-12.0.5.ebuild 8042 BLAKE2B 688709ee140593bb931674a7147775d8e819d3177121a329f8139238419200ca1f4d438c6718a804e75d9e5e4b0567c1a2b163b62cc79d6a4d7cbcbe349d7baa SHA512 759311173f80ee02324552ff2fce079aaa00949cf57616110b78ced759a1b69ba179b5186747747d4d74c8e420d89261cd2a6beca05cf28a7cf098591da3133f
-EBUILD cinder-13.0.2.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
-EBUILD cinder-13.0.3.ebuild 7811 BLAKE2B f903b27a6a07b69413fadabd0e94a368b4553438fe89404b9fdceefe4f77a80924bbabc84460393c6437583c34e6fb9d108d222e1e84a387c8864f7fe731390a SHA512 8ace1323dad4c04e7ef36042104552c870f560ab376b4b192a28923dafad60915ea9f0631fe239ec47a8ffa65b1d15daf66f4ad7a19b44497e234a7b953b27b4
+EBUILD cinder-13.0.3.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
 EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B f1c7f6f21eed9724ca1ba3a4461be1c1c8c7d17b6bd6e0d7eaa2f3f9ad56cf6c96946266eaafca58624a5501d5560307a776cb8c4209f18525589738aa388b16 SHA512 0d985ee9d439aaaad712d065ed66c3b603688f516172d50f004c4a4793554755fc7bcf2c787bd85ecc7076ea2b489f971567efa042a718764b64c23edaa21ddf
 EBUILD cinder-2018.1.9999.ebuild 8047 BLAKE2B 9d4be05868caddcf9d8bc1d7355c1c9efba7860f5d3adc01fac2be8376ea7c6dbda724de54c5cd5bc505c01dd36962c24d0e53eb8e6dfb749bacfa7676c0c2f1 SHA512 4ccc67e7c2a7603b48268f548662e0b974e688383f546b4b35346cd248705221536f25408936cac050c1b366ffa4a06b7d9254a9480c4e6c656440743247bed1
 EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
diff --git a/sys-cluster/cinder/cinder-13.0.2.ebuild b/sys-cluster/cinder/cinder-13.0.2.ebuild
deleted file mode 100644
index a8e41663d73e..000000000000
--- a/sys-cluster/cinder/cinder-13.0.2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/rocky"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-13.0.3.ebuild b/sys-cluster/cinder/cinder-13.0.3.ebuild
index f3ef098f76ee..a8e41663d73e 100644
--- a/sys-cluster/cinder/cinder-13.0.3.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index f2f4e21ef0b5..5ac50540745f 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -6,5 +6,5 @@ DIST galera-3-25.3.24.tar.gz 3373375 BLAKE2B db837add9d74e2acb312bd974f00b52d269
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
 EBUILD galera-25.3.23.ebuild 1834 BLAKE2B c9c0ce726168b44adebd8a862f0446865e9acfb22dee871c322a60c3a2bbd1b1e02fc363ed2840f09cad7f7ca984128319fb49fab2470e5dee97586f8d2b51de SHA512 f5389646c9d5ef832a430440e31c27e99488352a645657a2044f4739c45ef185207e0a3466a35b731b68a9d53c362b28ca4aa9ef91e403a506ee1a435e1a1aae
 EBUILD galera-25.3.24.ebuild 1838 BLAKE2B 0803ea202f990158eb9b9dd2f8b019885c71d24337543bb465d36f498bdaf8444275b0d0e45dafd182b69ada8d2e530701fbb32377f909c257d81fd9212bf4e9 SHA512 d1a86a5aee5cf7087cd76af06764274dde519494da74367e5068bc5b2e530dda33e2869a8755ea327a3615d7ad87cb8973118f25c523fa2183ff1f01d06b06f7
-EBUILD galera-25.3.25.ebuild 1902 BLAKE2B 09a5879a50bb40be7ba4c7d4535f94ab8a0ca37ac63b16881098b4ff82e19f4cdb66297b84c69ea5b7820999ab7fc91efe5fd9cf5ceb55eec00b0287238c0dff SHA512 c54f9836f27a407900e10164f29ef6ef3f4e8008f3524443fd5433f9ce2daabe21dbcb3b963d0bb9b4e7ea3f1533b10e441569f63148d81a29c0e225ea119d1c
+EBUILD galera-25.3.25.ebuild 1898 BLAKE2B 233d5916fa1859a43ac111ecc8ae5051851a30527a8e635880a0fefe2bec46a3415164b01faeb9808ee2b23909febf2750b8603de0b3c201e5b70393316f1868 SHA512 965e5874a357095dd6b410eb2aaa6d8bb20c11b636a40a1276dc2009a536a3cb6745a1ad6c76bbff19b2b6707f45743699716fe1104c8be471ca1e770807638f
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
index 63c58040a94a..86678c81fd10 100644
--- a/sys-cluster/galera/galera-25.3.25.ebuild
+++ b/sys-cluster/galera/galera-25.3.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 
 CDEPEND="
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 9bae79ab926f..bf1a79a4b15b 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -8,8 +8,10 @@ DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
 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.12.6.tar.gz 28142622 BLAKE2B 7f3541356aebb3f60c27ba1ae1c9c50867bf77ae8cb585955b38addc1015ef0dbbf0bd21e454610ee2fe6c9811c0d32fe912de368f7bf5d95fe60cab7a538354 SHA512 bd4b28fb6ecb7212c9bd6fb24b3ba59466ed9d684a4ba4e403e0270fc96ac5d1bcdcf8ea0be0085353af29bbfe73ab6ff1cda5127ea123ad7660c3022cab4703
 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.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-apiserver-1.10.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 EBUILD kube-apiserver-1.10.12.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
@@ -18,7 +20,9 @@ EBUILD kube-apiserver-1.11.6.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab223
 EBUILD kube-apiserver-1.12.3.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 EBUILD kube-apiserver-1.12.4.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
 EBUILD kube-apiserver-1.12.5.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
+EBUILD kube-apiserver-1.12.6.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
 EBUILD kube-apiserver-1.13.1.ebuild 1225 BLAKE2B 4cbeca88c998d0b110d39db217d62026a7b86f8228ee07306108a8a4fe1ba24c7bae71e16672d55ba9875ba7c78d0a5f1b5720a8e8417ef9fe1a68e7c9df5d38 SHA512 1bf6cae63276cd9c8c45c13d7a8153d77e3ade28d794e0e5dfd313666d1ad855b0b8842ff00533537c6a153361a2cf627878bb10f1389368cd9a0304246adbc2
 EBUILD kube-apiserver-1.13.3.ebuild 1225 BLAKE2B 4cbeca88c998d0b110d39db217d62026a7b86f8228ee07306108a8a4fe1ba24c7bae71e16672d55ba9875ba7c78d0a5f1b5720a8e8417ef9fe1a68e7c9df5d38 SHA512 1bf6cae63276cd9c8c45c13d7a8153d77e3ade28d794e0e5dfd313666d1ad855b0b8842ff00533537c6a153361a2cf627878bb10f1389368cd9a0304246adbc2
+EBUILD kube-apiserver-1.13.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.9.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.12.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.6.ebuild
new file mode 100644
index 000000000000..386be89ec764
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.12.6.ebuild
@@ -0,0 +1,47 @@
+# 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"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.13.4.ebuild
new file mode 100644
index 000000000000..a1931590ff31
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.13.4.ebuild
@@ -0,0 +1,48 @@
+# 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/legion/Manifest b/sys-cluster/legion/Manifest
index e0f4239fea57..ed5b12195018 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -9,14 +9,14 @@ DIST legion-17.10.0.tar.gz 2975023 BLAKE2B 772f666c0cd8fc96e1e460e4c8253289069ee
 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
-EBUILD legion-17.05.0.ebuild 881 BLAKE2B 5882193463db2b6126b4835bb67b4df74563d871f155ba1ae684c29a385c08fe29cbead6f8b5081bd5a0d06e1a43fb194769bd56271250b47788ab14dd2577e1 SHA512 8976cb8040a1ad4a205900ee6d040029c54c1cf802a70d83fc52b63190bd8405d1f0107f4a0a9e5a3cb9ba37a9e2446a4f7a2b84587ba33b83d60d2dfea9c01f
-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 a0591e3810c6a0bd76bf0ef9d3367bbe0e64518df15451cf26f9f9d716bf074e1020e2f03dfd265b363f917ea2b9878cc011839719d45f567f0b4ecd4f3fb0c8 SHA512 d0d4f3b47300dc4bd30acdcd8b7768fa03a75646377937372726bd6a3a0df0e608907714f08c5582382549f6fa4d8c878011c45cbfb4a515bf00252e4de6f6a0
-EBUILD legion-18.12.0.ebuild 925 BLAKE2B a0591e3810c6a0bd76bf0ef9d3367bbe0e64518df15451cf26f9f9d716bf074e1020e2f03dfd265b363f917ea2b9878cc011839719d45f567f0b4ecd4f3fb0c8 SHA512 d0d4f3b47300dc4bd30acdcd8b7768fa03a75646377937372726bd6a3a0df0e608907714f08c5582382549f6fa4d8c878011c45cbfb4a515bf00252e4de6f6a0
-EBUILD legion-9999.ebuild 925 BLAKE2B a0591e3810c6a0bd76bf0ef9d3367bbe0e64518df15451cf26f9f9d716bf074e1020e2f03dfd265b363f917ea2b9878cc011839719d45f567f0b4ecd4f3fb0c8 SHA512 d0d4f3b47300dc4bd30acdcd8b7768fa03a75646377937372726bd6a3a0df0e608907714f08c5582382549f6fa4d8c878011c45cbfb4a515bf00252e4de6f6a0
+EBUILD legion-16.08.0-r1.ebuild 840 BLAKE2B 970bb0a197937a2ebd85a3b914976e37aa87927647087d27e081d89ad3a8cfff85314d87cf6e530828571ccd9c05dc8c25a009f83360b01957ddea727bd918e9 SHA512 0327cd9ed44be69166be223d121c26841a4ef85900b2c9eaad46fd669ef992d8a4524488a033f5cb65e571335b18120a12f95474fc2a9d5b79464a08f4fbf620
+EBUILD legion-16.10.0.ebuild 667 BLAKE2B 8894292d2739d88571f5654b1285a7ce7fbb379d67b1af331c59645ba3f02cb88c42a6122f57a18bec4dadcd2ab556def9cf40f4a027ea340b03d21d55c59390 SHA512 47cc5201d73d73ba116c4acf0c17d62294d1b20885d6dcde61284c5201c5c7307c9322f97f09ee04a4d17072d2e5c455090c27ca70225f50561b75ffcbd1f286
+EBUILD legion-17.02.0.ebuild 722 BLAKE2B b9b29f20d40d2346d471bad5dde3d422c04dc453dd43a3634b5718bedd846201b560e857a8e5f0efc826b2705d7d336be1708a5f0bbaf88456eba6f5d7bb9fc0 SHA512 278f257a529338789ebf129e8d267daa44e12d0f34451bd2be16688c8dad931dcf3179f1b8df704c443f5deb35e6a8b4dac6cbad607de31ed370860f59eb42c1
+EBUILD legion-17.05.0.ebuild 879 BLAKE2B b32a747d613a4dc4f7d1a2f060d5246ad096769327efa6cd1bdf2e7bbad156f8645ba06db0d1037f6188e982c1f72f3e758001f49fbb662c3b1a188ec15a3484 SHA512 ceac923ea3dd73b3ab8887556483299c960da91971df3a40b1a240af1f55c68c961b83a5eb7f9ceefdca38fe026b5bee88b76bf555e97d49e2f607c9b953590e
+EBUILD legion-17.08.0.ebuild 923 BLAKE2B 545d476a264014ecaac73e2998e079c2e54d4cae3c0450768a02634f9aaa55459a24d52b55c78c9203c033e3963631ebb995288c333fce609524f495937485ce SHA512 ce8b2c3d42e5eb0835d355d8529b8572ec5d31d91d5f32a3838aa5db118cf0e884dd361951952eac4e6f0bcca910b45a306e53db651c091ed08c4d7aa7609346
+EBUILD legion-17.10.0.ebuild 923 BLAKE2B 545d476a264014ecaac73e2998e079c2e54d4cae3c0450768a02634f9aaa55459a24d52b55c78c9203c033e3963631ebb995288c333fce609524f495937485ce SHA512 ce8b2c3d42e5eb0835d355d8529b8572ec5d31d91d5f32a3838aa5db118cf0e884dd361951952eac4e6f0bcca910b45a306e53db651c091ed08c4d7aa7609346
+EBUILD legion-18.02.0.ebuild 923 BLAKE2B 545d476a264014ecaac73e2998e079c2e54d4cae3c0450768a02634f9aaa55459a24d52b55c78c9203c033e3963631ebb995288c333fce609524f495937485ce SHA512 ce8b2c3d42e5eb0835d355d8529b8572ec5d31d91d5f32a3838aa5db118cf0e884dd361951952eac4e6f0bcca910b45a306e53db651c091ed08c4d7aa7609346
+EBUILD legion-18.05.0.ebuild 926 BLAKE2B 0e00ec60df81971d27733f798591cdd838de6094bab32eafe1fb066ad7ad60dedf0854518e14b5632d550a807350b242540bd4eaa82fc3804ce236d66fee4e1e SHA512 6c045ba2871a450d1f4d85cdea6d98a5654174f303633d66c5e56f491ba1eaf202e1a4c118caa93108c8d5a9118e4f055b1d7c23731bc8e43ecd5de3e171fcd7
+EBUILD legion-18.12.0.ebuild 926 BLAKE2B 0e00ec60df81971d27733f798591cdd838de6094bab32eafe1fb066ad7ad60dedf0854518e14b5632d550a807350b242540bd4eaa82fc3804ce236d66fee4e1e SHA512 6c045ba2871a450d1f4d85cdea6d98a5654174f303633d66c5e56f491ba1eaf202e1a4c118caa93108c8d5a9118e4f055b1d7c23731bc8e43ecd5de3e171fcd7
+EBUILD legion-9999.ebuild 926 BLAKE2B 0e00ec60df81971d27733f798591cdd838de6094bab32eafe1fb066ad7ad60dedf0854518e14b5632d550a807350b242540bd4eaa82fc3804ce236d66fee4e1e SHA512 6c045ba2871a450d1f4d85cdea6d98a5654174f303633d66c5e56f491ba1eaf202e1a4c118caa93108c8d5a9118e4f055b1d7c23731bc8e43ecd5de3e171fcd7
 MISC metadata.xml 482 BLAKE2B 7e3a7dbb680ebe09062916b1c5205f3f29ecff8ffe003e9b8e6675838fed668e6468f06a6dc26f3a5c307c77105cfb911f01c23f795140f3c5d99c13811aeb1d SHA512 bc28b76e1b0479d70e2db624340097739337c8be35dd16e8ed2ef71444a0a18c579a296c65a0bbc679dd1c8a86f29eb423e9e8cca93da78f9fbea28f537da3d4
diff --git a/sys-cluster/legion/legion-16.08.0-r1.ebuild b/sys-cluster/legion/legion-16.08.0-r1.ebuild
index e90f7d02ed71..c785d40df28f 100644
--- a/sys-cluster/legion/legion-16.08.0-r1.ebuild
+++ b/sys-cluster/legion/legion-16.08.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sys-cluster/legion/legion-16.10.0.ebuild b/sys-cluster/legion/legion-16.10.0.ebuild
index ced14b8e65e5..6ed64ffe46d3 100644
--- a/sys-cluster/legion/legion-16.10.0.ebuild
+++ b/sys-cluster/legion/legion-16.10.0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sys-cluster/legion/legion-17.02.0.ebuild b/sys-cluster/legion/legion-17.02.0.ebuild
index 03e2d594815d..415747a8aa60 100644
--- a/sys-cluster/legion/legion-17.02.0.ebuild
+++ b/sys-cluster/legion/legion-17.02.0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sys-cluster/legion/legion-17.05.0.ebuild b/sys-cluster/legion/legion-17.05.0.ebuild
index 443814e2abdd..e9b172068e97 100644
--- a/sys-cluster/legion/legion-17.05.0.ebuild
+++ b/sys-cluster/legion/legion-17.05.0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-17.08.0.ebuild
index 4d6ccbc9cb31..91e84737ce24 100644
--- a/sys-cluster/legion/legion-17.08.0.ebuild
+++ b/sys-cluster/legion/legion-17.08.0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/legion/legion-17.10.0.ebuild b/sys-cluster/legion/legion-17.10.0.ebuild
index 4d6ccbc9cb31..91e84737ce24 100644
--- a/sys-cluster/legion/legion-17.10.0.ebuild
+++ b/sys-cluster/legion/legion-17.10.0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/legion/legion-18.02.0.ebuild b/sys-cluster/legion/legion-18.02.0.ebuild
index 51357e884176..91e84737ce24 100644
--- a/sys-cluster/legion/legion-18.02.0.ebuild
+++ b/sys-cluster/legion/legion-18.02.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/legion/legion-18.05.0.ebuild b/sys-cluster/legion/legion-18.05.0.ebuild
index c52bb9263a68..400a9b1facff 100644
--- a/sys-cluster/legion/legion-18.05.0.ebuild
+++ b/sys-cluster/legion/legion-18.05.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/legion/legion-18.12.0.ebuild b/sys-cluster/legion/legion-18.12.0.ebuild
index c52bb9263a68..400a9b1facff 100644
--- a/sys-cluster/legion/legion-18.12.0.ebuild
+++ b/sys-cluster/legion/legion-18.12.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/legion/legion-9999.ebuild b/sys-cluster/legion/legion-9999.ebuild
index c52bb9263a68..400a9b1facff 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="http://legion.stanford.edu/"
+HOMEPAGE="https://legion.stanford.edu/"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 59134ee52420..20d5db9834e7 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,30 +1,22 @@
-AUX CVE-2013-4319-2.x-root-submit-fix.patch 1253 BLAKE2B 9f528ef347c5192bc563223c307c9200bdecd51db3521b8eac05e67ba7e2accba53a6a500a7d19d35190b723b2b21a0b78bcd4dbe9f4ddbbc52ed9b5f94b8cb4 SHA512 78780ad87e997f22b6abbc3cb51c313616e90320d997705c534c35fbc7f5738b7a2e0ace33051e6e15d4f6e0ab6f97ab9f1ef60dcee5fc4544db13b0a72ea5c4
 AUX CVE-2013-4495.4.1.patch 9063 BLAKE2B d5ab34ecfc095d266a4e2201640371409828368322f209378c55dc254fbeae02e92ba3e71e442ded77ee89972f8d1b4e7d5cdae025f5122b49b74bd79ba641dc SHA512 52d0105c8d756e50252926c764eff46653544584c25c43d4dbaf70ed45a1c610c9381b1f735ff6c436774fb8d77a2a7607e0ea2b70eaae927e9a1024b3048913
-AUX CVE-2013-4495.patch 836 BLAKE2B 12688cbeef67d928da6936f14d55655ff3c427f95bc245eab4fee280b00c887963aa33ea4554ec71cdabbac920eac53918fa830b27c3a1b52d963bbe90edf9b7 SHA512 91522f5c8b6fa2e5de80f02e24b2a6827422c335d88600bcbb1a763dd985b3e52b850eab5059adbe4e543311551ec0da21cd69fcb7dc6e01ff93bff843769d8c
-AUX CVE-2014-0749.patch 750 BLAKE2B bb00bd167a75023d523b57330792d06ac08e6cd4d6caeb0fa49be66e859226c22f5fdbe666f725b846d8a73f46890943ee42234bda07c41067465d34da42e093 SHA512 8830f4d1a0190876e97fc568a3ac84341c042686a630cc5a7d8f254414dd13063f08db3b490e447698d9c16430ab6c8990c70ee1acda2435a0b0debfb2666829
-AUX TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch 4292 BLAKE2B f75fafe1f953a103585a58d1aada13809ac73189779192995e88827f5380b0ed299b8adf6c283ea3ff10535ee9a67b370dbd9979654dc70c3ade0ef520bcf7ac SHA512 15bb5b271b62be03df2b6aeab89082f3003abc67e00aaef96539ab88f21879f3cf30a95303fe68b3e4984cdc4f4c020e61328a4e3c26b4e44be9eafa9be3b5a6
 AUX pbs_mom-init.d 1084 BLAKE2B ab674f9670317034a775a07237754078cc89356d91bfdf86fc91ed850328fc4aa302e71be5a5e9a8ac32b6617efe5a63ed5162a9b5fcd945220162e20bb259f6 SHA512 698707c833070f77224e55788799ae4b32088b47221bfd9ed8fbb4097095bb4771ec39db831bbfd5af46d0a6addee04464bc71ef548ca94f3a324ebb97ce8a9c
 AUX pbs_mom-init.d-munge 1149 BLAKE2B b4a70810c53bcc0508c03893fe89bf2f6c135563694e48de0f04b5494918cd2eae0e61fba9dae4a17b2ebc5e1d70084c6ae272372721cca4d12ac7dfbc06a395 SHA512 643deb1f21983dbdd8aa53416899db01ff651d81b3d989299eef9c2d3e1aab0e9b083cfae9bb559b6c3195238998a881ec5bf2a663e09f7f8508bb895bc11027
 AUX pbs_sched-init.d 1165 BLAKE2B c4768e5ebfa8d39b2ef78dd9c14ee90bde6f64b42d0fa3f304b2a55ca5a4ee24de0666f9f6518bd3f9813c82aed139487d0b784293afe76fac36b1e18bc9598f SHA512 9417ffe5a417d69e03262221816b2778aacfe7cf393ea5b5ea535497f4dfcbad9545d49cdbcacaaa5e8a0fd01432806aac8e050b4979cabb59656c1256a91dd0
 AUX pbs_server-init.d 1615 BLAKE2B d29bc83b87c684d88fdb93689582cd5dfbecaa8ca035a6fc52a0da0b3a068a034eb88b92c8428cb605a4674cebaf0dc75a58cb2fd2be293fadfca9899e85c806 SHA512 459334236d5614522dafa15c0144bbf9e9b5fe89ce73d61fde6b1bfbcc96c284d8f827069c4dd77f7a6c5fb2828923d60a9381c158123d5f6edd5ca50a471c21
 AUX pbs_server-init.d-munge 1689 BLAKE2B e4a3b95e54f73110716796c1ca90d124112c57287506628af8add62a2d24689f0e00706e9ebc0cf4aa7a4e3b6d30ebaaddf02a7cf640172e73b00d92fac38734 SHA512 b9628241581fbed629d0edf83a3f987de894fb5711061239e737f63ef7dbe9033d35aa87a38b56dbd8da887a3058f9f284bfe101ee13db3464e6e814b537ea23
-AUX tcl8.6.patch 2396 BLAKE2B c72854119840df1759a3085c41dfe6aa234c068fb035f3352be5ae5ace57e45c3b2ead502e0c3507c1e1ac1246bc9f86bd7e5e0205799e04d84f95cb05cc993b SHA512 a288526bf43cd39d0b5505938f02ee38ccd70481a1b6351a80c5cd151376604d5cdc925293d3bd7f2d4bbe50182993448da645ca42f58e3f1bdf59bce9363b4a
 AUX torque-4.1.5.1-tcl8.6.patch 2546 BLAKE2B f0c1c2d5df20c53a58a47de3fc0e226d2e9d99aa9b4f32c5cef1a036c77083ed156d7fba6ba1358077e5fc64ce3c4be41a76d2a4085f345e49753bad37e986d7 SHA512 0cd584784b5254daf11635e1d6252fa4fe3c5f2e46a0771452016f66ff0e3be01b91d154cef0a793cf0ab0df223ef5c51303d35c419f1d9addc64ea26a892521
 AUX torque-4.2-dont-mess-with-cflags.patch 806 BLAKE2B d4be6b841f354c5ab9eca24cd2ee330607f83000f1d7086d2cd885427f67537a9c75105b1afa9bdb1a8475bfa408d1aff903cc1d9bd5c7dfbe3d9aaf5f2fddaa SHA512 23aeb87fc75ec8b916817264501240b9f0fae7b3e81662496824dcccc21d1a07b2b58221ea22ca6551b6830e76347416a09da6c22de4aea173a32fe13c90c7ff
+AUX torque-4.2-use-NULL-instead-of-char0.patch 3898 BLAKE2B 9d693f6fc8a7dc4d9a3e3517c41ece9cde8f4567cf75439b47bfbf1041cf043b69c7666eb44a477ca6dac79415bd396782ee62535f7f4c32aa3caac4431d2347 SHA512 af6bb3e257f8f4c232c83ed8d0a4a4b8a451acb42bfec36aa1caa3191ab242109f1712bbd639219254e5ab42fa518990343b917ebf9d21406eb23e8b7c9141f3
 AUX torque-4.2.9-tcl8.6.patch 2702 BLAKE2B c1444b5f4da1d37e21fe5a8970e188926080805db83406f5caca2cf27dddebf069d9d9747c33e3a1e2b0ec5f36e95d80d1c69151129967d432cd2d11c5e1ecf8 SHA512 9844a1f633f049a66cf31d3721f6a5e205ede26186da1357e0b0aa2c0c4d064cbdff45e2f7e685d6c4afd09d961e59ff1759163e4a2ae349fa866e960c1bcf77
 AUX torque-6.0.3-fix-emptystring-comparison.patch 542 BLAKE2B c5acba0cfb1a4ca40a77710563fe42b928052253c3569d9e130357142a0456601bbf671d61db32f54881498f4bc77b588d0cfef3431a35b30c3e3858a6aed002 SHA512 0303c49ef2a407773b9cd14f15e825d13e9a5c9ae91118ed770d81ccb59bbe01fb3614e6865b1be81e6f9618fba3a09cc4fe447a0e6684f1e142c49e17970189
 AUX torque-conf.d 649 BLAKE2B 819a53a96a35d77b45d3c536278a088845cbbbd4ac1606b7d822ae36909477428c692975edcd69b519e348fa2cfc7d01c013db33daae65b9a0ba169456324443 SHA512 b82f6c1d661bed03a32c3761530c4b303715167a317e467371091b11d3ae0e19e9784b1588577ee5f65397cb0699818ed5f621aeb66d3f2d218df12d0cf39bde
 AUX torque-conf.d-munge 784 BLAKE2B fe4fc64377da0ed0232961462bd92fea4fae68760dd698cf2759105f75686c5c77c3cff2c3fac3531c4b4905244cbc9df0fe67fe62a410a63b35008429dd1261 SHA512 a78634a6f2bdf3c24e8c99d3cd7a9634daa32d69244a9ddfcc26199f4d04e901abbfa79ad057f5a4e4c492c9e21bc0c65edd8465ac6935fb7c67c8c639e75d68
 AUX torque-env.d 240 BLAKE2B 49ef384c36369e02f11575b40f881efcbc3605dc7c52eb1694f721e15055542296c064628a9ed605638600a1319c6ec18691e5f3e3e94304ada8b7596997765f SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042
 AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32b0f6ad002f1dd8f73f72f351e889c908b2d38b0d09699734e4ea316c2bea2d76de0a436c34222d58 SHA512 55f19b5effc21444addb465967bbd44d6f67dc48945221753512216c4fc26878d90569cdee7b277676d157aa241c04dc08df65505d21f59f046fa5448d43b81d
-DIST torque-2.5.13.tar.gz 5854910 BLAKE2B 47fa519cbd2d9aeecb3bc323ba3f08f871b2259eb9c83335449a1f7c0d382fdffd0ced4f3ef09707c50a222d77ca0e5a39536b5c0f734bee37d3b50aec710430 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf
 DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6
-DIST torque-4.2.10.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1
-DIST torque-4.2.9.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1
-DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1
-EBUILD torque-2.5.13-r1.ebuild 7741 BLAKE2B 7510cd74459f7ef77ad5b707d1307720d8e08345fe4f632201d4e679c2afdf31859a64d6f7d706054abab281a54e373681040763914e7131d4eeec74b7676877 SHA512 d17389297c11f28c4f849e95d2f5c87f428d2b8d3c6a907d5863f4cbdd19a41532cb5abf5b9d78092f99b2838c2e1892b8fb7111b4dcb98338bfa11c4bbc5e5d
+DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
+DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
 EBUILD torque-4.1.7-r1.ebuild 7491 BLAKE2B d4c4a0be3c07eca1ae0a79fbe52ea153c4c013155426aa9cba4d4f2cc70086883c3b5345026450cd5608ae4e26773dabb9a70742cf9e7cf7dc968a7cc8210380 SHA512 e7213e0df29564fa24a48bf8b96e59a69fbd56abf5c470b794eb19fbdefe705ead880d9d908f006c9c79eeab325b0f6ccc3ae64973cb1e50061c2020c64aa816
-EBUILD torque-4.2.10.ebuild 5942 BLAKE2B d80997472d7af67feed64dd01853700000d6e1030ed7a8fbafbb811d2962f92a4fb3f7c8c2ab8bf611b013eda434c1f1a13af9e6ac991b5ee566a9a4586cd770 SHA512 b31613ee3bbf1623180a55e20a61ef21909a520d9fe04f776a885b06ba3335a4f684c8b18017d658c36151663a6baecbe804d6750a954bb38fc90160b0e52ad6
-EBUILD torque-4.2.9-r5.ebuild 5687 BLAKE2B e9977c7de9a3d8254cae0da6a98b30f60176776dfb55b5b77c0709e60eb1ddc3c4d420a4cff0c0659e9164f11d94f98a550983a7690f5bc06b53d2a4dff90b6a SHA512 faa2b1e99265f1222123a4b30c0edeb512d67d2285cf56789c21dcf85d43daab2ebbf38a6d768614d9124b1b0b43ffec895da4010b4fab36574b79be461c8860
-EBUILD torque-6.0.3.ebuild 5699 BLAKE2B f4d003c110c9c740552e4bb42ca19f4d935b3651ae8624805251d003aedc1feac110a145e1978ea36361b63f18036ed48b457e413a8e69d0765ae2ae01a05952 SHA512 03647560ea0af8ead4403d8a87de1855eb86e7187a2a436da9ea7909086384d85548c43d8c57986c21ea0cc5988bc0394eb2ed73b0ce3afbc39058ad98bb538f
+EBUILD torque-4.2.10-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8
+EBUILD torque-6.0.4.ebuild 5463 BLAKE2B b6202d1c5679637d7d305bef8ec3a5f6d09d6e61eb0dc42093fade8349bd014f30304b6d82f0dcab6267d5d1f5102c3c3246e41e68329e3c9219ccdc9ad5126c SHA512 710971b3b72dc388b7631cba09a46096b45022a803bd1570774cc276d416c6f6426bbb8304d56a30d49de9c940cac6574d1e20e324c42d5aa95813ceda035fdf
 MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43
diff --git a/sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch b/sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch
deleted file mode 100644
index aa53239f157c..000000000000
--- a/sys-cluster/torque/files/CVE-2013-4319-2.x-root-submit-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5dee0365a56dd2cc4cfd0b182bc843b4f32c086c Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 23 Dec 2013 12:40:27 -0500
-Subject: [PATCH] CVE-2013-4319: 2.x root submit fix
-
-https://bugs.gentoo.org/show_bug.cgi?id=484320
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4319\
----
- src/server/process_request.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/server/process_request.c b/src/server/process_request.c
-index d4a3c92..b06a333 100644
---- a/src/server/process_request.c
-+++ b/src/server/process_request.c
-@@ -640,6 +640,21 @@ void process_request(
-         log_buffer);
-       }
- 
-+    if (svr_conn[sfds].cn_authen != PBS_NET_CONN_FROM_PRIVIL)
-+      {
-+      sprintf(log_buffer, "request type %s from host %s rejected (connection not privileged)",
-+        reqtype_to_txt(request->rq_type),
-+        request->rq_host);
-+
-+      log_record(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, id, log_buffer);
-+
-+      req_reject(PBSE_BADHOST, 0, request, NULL, "request not authorized");
-+
-+      close_client(sfds);
-+
-+      return;
-+      }
-+
-     if (!tfind(svr_conn[sfds].cn_addr, &okclients))
-       {
-       sprintf(log_buffer, "request type %s from host %s rejected (host not authorized)",
--- 
-1.8.3.2
-
diff --git a/sys-cluster/torque/files/CVE-2013-4495.patch b/sys-cluster/torque/files/CVE-2013-4495.patch
deleted file mode 100644
index 41232c07ec72..000000000000
--- a/sys-cluster/torque/files/CVE-2013-4495.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8246d967bbcf174482ef01b1bf4920a5944b1011 Mon Sep 17 00:00:00 2001
-From: David Beer <dbeer@adaptivecomputing.com>
-Date: Wed, 13 Nov 2013 10:47:48 -0700
-Subject: [PATCH] Use Michael Jenning's patch for CVE 2013-4495 instead of the
- original. This one is being used because 2.5 should face the minimal possible
- change.
-
----
- src/server/svr_mail.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/server/svr_mail.c b/src/server/svr_mail.c
-index 26b6dd7..241bdfc 100644
---- a/src/server/svr_mail.c
-+++ b/src/server/svr_mail.c
-@@ -372,11 +372,9 @@ void svr_mailowner(
-     exit(1);
-     }
- 
--  sprintf(cmdbuf, "%s -f %s %s",
--
-+  sprintf(cmdbuf, "%s -t -f %s",
-           SENDMAIL_CMD,
--          mailfrom,
--          mailto);
-+          mailfrom);
- 
-   outmail = (FILE *)popen(cmdbuf, "w");
- 
--- 
-1.8.3.2
-
diff --git a/sys-cluster/torque/files/CVE-2014-0749.patch b/sys-cluster/torque/files/CVE-2014-0749.patch
deleted file mode 100644
index 52131edcf7e0..000000000000
--- a/sys-cluster/torque/files/CVE-2014-0749.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3ed749263abe3d69fa3626d142a5789dcb5a5684 Mon Sep 17 00:00:00 2001
-From: David Beer <dbeer@adaptivecomputing.com>
-Date: Fri, 23 Aug 2013 15:53:09 -0600
-Subject: [PATCH] Merge pull request #171 into 2.5-fixes.
-
----
- src/lib/Libdis/disrsi_.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/lib/Libdis/disrsi_.c b/src/lib/Libdis/disrsi_.c
-index 69edd28..154514c 100644
---- a/src/lib/Libdis/disrsi_.c
-+++ b/src/lib/Libdis/disrsi_.c
-@@ -112,6 +112,15 @@ int disrsi_(
-   if (dis_umaxd == 0)
-     disiui_();
- 
-+  if (count >= dis_umaxd)
-+    {
-+    if (count > dis_umaxd)
-+      goto overflow;
-+
-+    if (memcmp(scratch, dis_umax, dis_umaxd) > 0)
-+      goto overflow;
-+    }
-+
-   switch (c = (*dis_getc)(stream))
-     {
- 
--- 
-1.8.3.2
-
diff --git a/sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch b/sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch
deleted file mode 100644
index 63713a0bc16f..000000000000
--- a/sys-cluster/torque/files/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From f2f4c950f3d461a249111c8826da3beaafccace9 Mon Sep 17 00:00:00 2001
-From: Chad Vizino <cvizino@adaptivecomputing.com>
-Date: Tue, 23 Sep 2014 17:40:59 -0600
-Subject: [PATCH 1/2] TRQ-2885 - limit tm_adopt() to only adopt a session id
- that is owned by the calling user.
-
----
- src/cmds/pbs_track.c             |  6 ++++++
- src/include/tm.h                 |  2 +-
- src/include/tm_.h                |  1 +
- src/lib/Libifl/tm.c              | 37 ++++++++++++++++++++++++++++++++++---
- 5 files changed, 56 insertions(+), 4 deletions(-)
-
-diff --git a/src/cmds/pbs_track.c b/src/cmds/pbs_track.c
-index 7a90fda..9383ea5 100644
---- a/src/cmds/pbs_track.c
-+++ b/src/cmds/pbs_track.c
-@@ -164,6 +164,12 @@ int main(
- 
-         break;
- 
-+      case TM_EPERM:
-+
-+        fprintf(stderr, "pbs_track: permission denied: %s (%d)\n",
-+                pbse_to_txt(rc),
-+                rc);
-+
-       default:
- 
-         /* Unexpected error occurred */
-diff --git a/src/include/tm.h b/src/include/tm.h
-index 106d3fb..2288828 100644
---- a/src/include/tm.h
-+++ b/src/include/tm.h
-@@ -125,7 +125,7 @@ int tm_register(tm_whattodo_t *what,
- /*
-  *  DJH 15 Nov 2001.
-  *  Generic "out-of-band" task adoption call for tasks parented by
-- *  another job management system.  Minor security hole?
-+ *  another job management system.
-  *  Cannot be called with any other tm call.
-  *  26 Feb 2002. Allows id to be jobid (adoptCmd = TM_ADOPT_JOBID)
-  *  or some altid (adoptCmd = TM_ADOPT_ALTID)
-diff --git a/src/include/tm_.h b/src/include/tm_.h
-index c9393b9..8cae7b0 100644
---- a/src/include/tm_.h
-+++ b/src/include/tm_.h
-@@ -136,6 +136,7 @@ typedef unsigned int tm_task_id;
- #define TM_EBADENVIRONMENT 17005
- #define TM_ENOTFOUND  17006
- #define TM_BADINIT  17007
-+#define TM_EPERM  17008
- 
- #define TM_TODO_NOP 5000 /* Do nothing (the nodes value may be new) */
- #define TM_TODO_CKPT 5001 /* Checkpoint <what> and continue it */
-diff --git a/src/lib/Libifl/iff --git a/src/lib/Libifl/tm.c b/src/lib/Libifl/tm.c
-index edb6273..4f38529 100644
---- a/src/lib/Libifl/tm.c
-+++ b/src/lib/Libifl/tm.c
-@@ -94,6 +94,7 @@
- #include <errno.h>
- #include <assert.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>
-@@ -169,6 +170,31 @@ typedef struct event_info
- static event_info *event_hash[EVENT_HASH];
- 
- /*
-+ * check if the owner of this process matches the owner of pid
-+ *  returns TRUE if so, FALSE otherwise
-+ */
-+bool ispidowner(pid_t pid)
-+  {
-+  char        path[MAXPATHLEN];
-+  struct stat sbuf;
-+
-+  /* build path to pid */
-+  snprintf(path, sizeof(path), "/proc/%d", pid);
-+
-+  /* do the stat */
-+  /*   if it fails, assume not owner */
-+  if (stat(path, &sbuf) != 0)
-+    return(FALSE);
-+ 
-+  /* see if caller is the owner of pid */
-+  if (getuid() != sbuf.st_uid)
-+    return(FALSE);
-+
-+  /* caller is owner */
-+  return(TRUE);
-+  }
-+
-+/*
- ** Find an event number or return a NULL.
- */
- event_info *find_event(
-@@ -1800,8 +1826,8 @@ tm_poll_error:
-  *     some mpiruns simply use rsh to start remote processes - no AMS
-  *     tracking or management facilities are available.
-  *
-- *     This function allows any task (session) to be adopted into a PBS
-- *     job. It is used by:
-+ *     This function allows any task (session) owned by the owner
-+ *     of the job to be adopted into a PBS job. It is used by:
-  *         -  "adopter" (which is in turn used by our pvmrun)
-  *         -  our rmsloader wrapper (a home-brew replacement for RMS'
-  *            rmsloader that does some work and then exec()s the real
-@@ -1835,7 +1861,8 @@ tm_poll_error:
-  *     the mom. Returns TM_ENOTFOUND if the mom couldn't find a job
-  *     with the given RMS resource id. Returns TM_ESYSTEM or
-  *     TM_ENOTCONNECTED if there was some sort of comms error talking
-- *     to the mom
-+ *     to the mom. Returns TM_EPERM if an attempt was made to adopt
-+ *     a session not owned by the owner of the job.
-  *
-  * Side effects:
-  *     Sets the tm_* globals to fake values if tm_init() has never
-@@ -1860,6 +1887,10 @@ int tm_adopt(
- 
-   sid = getsid(pid);
- 
-+  /* do not adopt a sid not owned by caller */
-+  if (!ispidowner(sid))
-+    return(TM_EPERM);
-+
-   /* Must be the only call to call to tm and
-      must only be called once */
- 
--- 
-1.8.3.2
-
diff --git a/sys-cluster/torque/files/tcl8.6.patch b/sys-cluster/torque/files/tcl8.6.patch
deleted file mode 100644
index 0361dbfead0a..000000000000
--- a/sys-cluster/torque/files/tcl8.6.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 061f15e06d6cf85e951cd321360067de5f0b2ce0 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Thu, 7 Mar 2013 22:33:04 -0500
-Subject: [PATCH] support tcl-8.6
-
----
- src/cmds/qstat.c                | 13 +++++++++----
- src/scheduler.tcl/pbs_tclWrap.c |  6 +++---
- 2 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
-index 5f85de7..7f289ba 100644
---- a/src/cmds/qstat.c
-+++ b/src/cmds/qstat.c
-@@ -88,6 +88,11 @@
- #if TCL_QSTAT
- #include <sys/stat.h>
- #include <tcl.h>
-+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
-+#define Tcl_GetStringResult(x) x->result
-+#define Tcl_GetErrorLine(x) x->errorLine
-+#define Tcl_SetResult(x, y, z) x->result = y
-+#endif
- #if TCLX
- #include <tclExtend.h>
- #endif
-@@ -1856,7 +1861,7 @@ tcl_init(void)
-   if (Tcl_Init(interp) == TCL_ERROR)
-     {
-     fprintf(stderr, "Tcl_Init error: %s",
--            interp->result);
-+            Tcl_GetStringResult(interp));
-     }
- 
- #if TCLX
-@@ -1869,7 +1874,7 @@ tcl_init(void)
-     {
- #endif
-     fprintf(stderr, "Tclx_Init error: %s",
--            interp->result);
-+            Tcl_GetStringResult(interp));
-     }
- 
- #endif /* TCLX */
-@@ -1980,10 +1985,10 @@ void tcl_run(
-     trace = (char *)Tcl_GetVar(interp, "errorInfo", 0);
- 
-     if (trace == NULL)
--      trace = interp->result;
-+      trace = Tcl_GetStringResult(interp);
- 
-     fprintf(stderr, "%s: TCL error @ line %d: %s\n",
--            script, interp->errorLine, trace);
-+            script, Tcl_GetErrorLine(interp), trace);
-     }
- 
-   Tcl_DeleteInterp(interp);
-diff --git a/src/scheduler.tcl/pbs_tclWrap.c b/src/scheduler.tcl/pbs_tclWrap.c
-index e859ae5..194c24b 100644
---- a/src/scheduler.tcl/pbs_tclWrap.c
-+++ b/src/scheduler.tcl/pbs_tclWrap.c
-@@ -924,7 +924,7 @@ char *argv[];
- 
-   if (argc != 2)
-     {
--    sprintf(interp->result,
-+    sprintf(Tcl_GetStringResult(interp),
-             "%s: wrong # args: job_id", argv[0]);
-     return TCL_ERROR;
-     }
-@@ -936,11 +936,11 @@ char *argv[];
-     return TCL_OK;
-     }
- 
--  interp->result = "0";
-+  Tcl_SetResult(interp, "0", TCL_STATIC);
- 
-   if (pbs_rerunjob(connector, argv[1], extend))
-     {
--    interp->result = "-1";
-+    Tcl_SetResult(interp, "-1", TCL_STATIC);
-     msg = pbs_geterrmsg(connector);
-     sprintf(log_buffer, "%s (%d)", msg ? msg : fail, pbs_errno);
-     log_err(-1, argv[0], log_buffer);
--- 
-1.7.12.4
-
diff --git a/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch b/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch
new file mode 100644
index 000000000000..a1cb85327d71
--- /dev/null
+++ b/sys-cluster/torque/files/torque-4.2-use-NULL-instead-of-char0.patch
@@ -0,0 +1,140 @@
+--- a/src/cmds/pbsnodes.c	2015-03-17 16:43:36.000000000 -0400
++++ b/src/cmds/pbsnodes.c	2019-02-25 12:33:37.824638386 -0500
+@@ -693,7 +693,7 @@
+         /* -N n is the same as -N ""  -- it clears the note */
+ 
+         if (!strcmp(note, "n"))
+-          *note = '\0';
++          *note = NULL;
+ 
+         if (strlen(note) > MAX_NOTE)
+           {
+@@ -821,7 +821,7 @@
+         {
+         nodeargs = (char **)calloc(2, sizeof(char **));
+         nodeargs[0] = strdup("");
+-        nodeargs[1] = '\0';
++        nodeargs[1] = NULL;
+         }
+       }
+     }
+@@ -901,7 +901,7 @@
+ 
+         MXMLCreateE(&DE, "Data");
+ 
+-        for (lindex = 0;nodeargs[lindex] != '\0';lindex++)
++        for (lindex = 0;nodeargs[lindex] != NULL;lindex++)
+           {
+           bstatus = statnode(con, nodeargs[lindex]);
+ 
+@@ -922,7 +922,7 @@
+         }
+       else
+         {
+-        for (lindex = 0;nodeargs[lindex] != '\0';lindex++)
++        for (lindex = 0;nodeargs[lindex] != NULL;lindex++)
+           {
+           bstatus = statnode(con, nodeargs[lindex]);
+ 
+@@ -946,7 +946,7 @@
+ 
+       /* list any node that is DOWN, OFFLINE, or UNKNOWN */
+ 
+-      for (lindex = 0;nodeargs[lindex] != '\0';lindex++)
++      for (lindex = 0;nodeargs[lindex] != NULL;lindex++)
+         {
+         bstatus = statnode(con, nodeargs[lindex]);
+ 
+--- a/src/cmds/qsub_functions.c	2015-03-17 16:43:36.000000000 -0400
++++ b/src/cmds/qsub_functions.c	2019-02-25 12:32:00.442982091 -0500
+@@ -542,7 +542,7 @@
+   static char tmpLine[65536];
+ 
+   /* we've reached the end */
+-  if ((start == NULL) && (*tok_ptr == '\0'))
++  if ((start == NULL) && (*tok_ptr == NULL))
+     return(0);
+ 
+   if (start != NULL)
+@@ -554,7 +554,7 @@
+     return(0);
+      
+   if ((*curr_ptr == '=') || 
+-      (*curr_ptr == '\0'))
++      (*curr_ptr == NULL))
+     {
+     /* no name, fail */
+     return(-1);
+@@ -574,18 +574,18 @@
+ 
+   /* strip blanks */
+   while ((*equals) && (isspace((int)*equals)))
+-    *equals++ = '\0';
++    *equals++ = NULL;
+ 
+   if (*equals != '=')
+     return (-1); /* should have found a = as first non blank */
+ 
+-  *equals++ = '\0';
++  *equals++ = NULL;
+ 
+   /* skip leading white space */
+   while (isspace((int)*equals) && *equals)
+     equals++;
+ 
+-  if (*equals == '\0')
++  if (*equals == NULL)
+     return(-1);
+ 
+   *value = equals;
+@@ -872,7 +872,7 @@
+   else
+     {
+     char *tmp_host = pbs_default();
+-    if (tmp_host == '\0')
++    if (tmp_host == NULL)
+       hash_add_or_exit(mm, job_attr, ATTR_pbs_o_server, qsub_host, LOGIC_DATA);
+     else
+       hash_add_or_exit(mm, job_attr, ATTR_pbs_o_server, tmp_host, LOGIC_DATA);
+--- a/src/include/attribute.h	2015-03-17 16:43:36.000000000 -0400
++++ b/src/include/attribute.h	2019-02-22 16:47:40.507695453 -0500
+@@ -445,7 +445,7 @@
+ extern int   parse_equal_string(char *, char **, char **);
+ extern char *parse_comma_string(char *,char **);
+ 
+-#define NULL_FUNC '\0'
++#define NULL_FUNC NULL
+ 
+ /* other associated funtions */
+ struct dynamic_string;
+--- a/src/resmom/mom_main.c	2015-03-17 16:43:36.000000000 -0400
++++ b/src/resmom/mom_main.c	2019-02-22 14:01:26.573890840 -0500
+@@ -4224,7 +4224,7 @@
+     goto done;
+     }
+ 
+-  name[i] = '\0';
++  name[i] = NULL;
+ 
+   for (d = ret_string, resline++;*resline;)
+     {
+--- a/src/server/job_attr_def.c	2015-03-17 16:43:36.000000000 -0400
++++ b/src/server/job_attr_def.c	2019-02-22 16:43:05.653007840 -0500
+@@ -1193,7 +1193,7 @@
+   },
+ 
+   /* JOB_ATR_system_start_time */
+-  {ATTR_system_start_time, /* start time as encoded in the proc/pid directory */
++  { (char *)ATTR_system_start_time, /* start time as encoded in the proc/pid directory */
+    decode_l,
+    encode_l,
+    set_l,
+@@ -1205,7 +1205,7 @@
+    PARENT_TYPE_JOB},
+ 
+   /* JOB_ATR_nppcu */
+-  {ATTR_nppcu, /* how to handle compute units (on Cray system) */
++  { (char *)ATTR_nppcu, /* how to handle compute units (on Cray system) */
+    decode_l,
+    encode_l,
+    set_l,
diff --git a/sys-cluster/torque/torque-2.5.13-r1.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild
deleted file mode 100644
index 7a45fb1c9002..000000000000
--- a/sys-cluster/torque/torque-2.5.13-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils flag-o-matic linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1643 -> ${P}.tar.gz"
-
-LICENSE="torque-2.5"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="
-	sys-libs/readline:0=
-	munge? ( sys-auth/munge )
-	tk? (
-		dev-lang/tk:0=
-		dev-lang/tcl:0=
-	)
-	syslog? ( virtual/logger )
-	!!games-util/qstat"
-
-# libncurses.so is just needed so that configure will pass for the readline check
-DEPEND="${DEPEND_COMMON}
-	sys-libs/ncurses:*
-	sys-apps/ed
-	!!sys-cluster/slurm"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-DOCS=( Release_Notes )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
-	# Find a Torque server to use.  Check environment, then
-	# current setup (if any), and fall back on current hostname.
-	if [ -z "${PBS_SERVER_NAME}" ]; then
-		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
-		else
-			PBS_SERVER_NAME=$(hostname -f)
-		fi
-	fi
-
-	if use cpusets; then
-		if ! use kernel_linux; then
-			einfo
-			elog "    Torque currently only has support for cpusets in linux."
-			elog "Assuming you didn't really want this USE flag and ignoring."
-			einfo
-		else
-			linux-info_pkg_setup
-			einfo
-			elog "    Torque support for cpusets is still in development, you may"
-			elog "wish to disable it for production use."
-			einfo
-			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
-				einfo
-				elog "    Torque support for cpusets will require that you recompile"
-				elog "your kernel with CONFIG_CPUSETS enabled."
-				einfo
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch
-	epatch "${FILESDIR}"/tcl8.6.patch
-
-	# 510726
-	epatch "${FILESDIR}"/CVE-2014-0749.patch
-
-	# 491270
-	epatch "${FILESDIR}"/CVE-2013-4495.patch
-
-	# Unused and causes breakage when switching from glibc to tirpc.
-	# https://github.com/adaptivecomputing/torque/pull/148
-	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-}
-
-src_configure() {
-	local myeconfargs=( --with-rcp=mom_rcp )
-
-	use crypt && myeconfargs=( --with-rcp=scp )
-	myeconfargs+=(
-		$(use_enable tk gui)
-		$(use_enable tk tcl-qstat)
-		$(use_enable syslog)
-		$(use_enable server)
-		$(use_enable drmaa)
-		$(use_enable threads high-availability)
-		$(use_enable xml server-xml)
-		$(use_enable munge munge-library)
-		$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset)
-		--with-server-home=${PBS_SERVER_HOME}
-		--with-environ=/etc/pbs_environment
-		--with-default-server=${PBS_SERVER_NAME}
-		--disable-gcc-warnings
-		--with-tcp-retry-limit=2
-		)
-	autotools-utils_src_configure
-}
-
-# WARNING
-# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
-# just fall over with the error message, but in some spots it will just ignore
-# you and fail strangely. Likewise it also barfs on our .keep files!
-pbs_createspool() {
-	local root="$1"
-	local s="$(dirname "${PBS_SERVER_HOME}")"
-	local h="${PBS_SERVER_HOME}"
-	local sp="${h}/server_priv"
-	einfo "Building spool directory under ${D}${h}"
-	local a d m
-	local dir_spec="
-			0755:${h}/aux 0700:${h}/checkpoint
-			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs
-			1777:${h}/spool 1777:${h}/undelivered"
-
-	if use server; then
-		dir_spec="${dir_spec} 0755:${h}/sched_logs
-			0755:${h}/sched_priv/accounting 0755:${h}/server_logs
-			0750:${h}/server_priv 0755:${h}/server_priv/accounting
-			0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts
-			0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users
-			0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues"
-	fi
-
-	for a in ${dir_spec}; do
-		d="${a/*:}"
-		m="${a/:*}"
-		if [[ ! -d "${root}${d}" ]]; then
-			install -d -m${m} "${root}${d}" || die
-		else
-			chmod ${m} "${root}${d}" || die
-		fi
-		# (#149226) If we're running in src_*, then keepdir
-		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d}
-		fi
-	done
-}
-
-src_install() {
-	# Make directories first
-	pbs_createspool "${D}"
-
-	autotools-utils_src_install
-
-	use doc && dodoc doc/admin_guide.ps doc/*.pdf
-
-	# The build script isn't alternative install location friendly,
-	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
-	for file in `find "${D}" -iname tclIndex`; do
-		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
-		mv "${file}.new" "${file}" || die
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-munge torque
-	newenvd "${FILESDIR}"/torque-env.d 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
-	fi
-
-	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die
-
-	# Fix up the env.d file to use our set server home.
-	sed -i \
-		"s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque \
-		|| die
-
-	if use munge; then
-		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
-	fi
-}
-
-pkg_postinst() {
-	pbs_createspool "${ROOT}"
-	elog "    If this is the first time torque has been installed, then you are not"
-	elog "ready to start the server.  Please refer to the documentation located at:"
-	elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
-	echo
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# root will be setup as the primary operator/manager, the local machine
-# will be added as a node and we'll create a simple queue, batch.
-pkg_config() {
-	local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	einfo "Using ${h} as the pbs homedir"
-	einfo "Using ${PBS_SERVER_NAME} as the pbs_server"
-
-	# Check for previous configuration and bail if found.
-	if [ -e "${h}/server_priv/acl_svr/operators" ] \
-		|| [ -e "${h}/server_priv/nodes" ] \
-		|| [ -e "${h}/mom_priv/config" ]; then
-		ewarn "Previous Torque configuration detected.  Press Enter to"
-		ewarn "continue or Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die
-	echo "\$logevent 255" >> "${h}/mom_priv/config" || die
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		# pbs_server bails on repeated backslashes.
-		if ! "${ROOT}"/usr/sbin/pbs_server -f -d "${h}" -t create; then
-			eerror "Failed to start pbs_server"
-			rc=1
-		else
-			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "create queue batch" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} \
-				&& ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \
-				|| die
-
-			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
-
-			# Add the local machine as a node.
-			echo "$(hostname -f) np=1" > "${h}/server_priv/nodes" || die
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-4.2.10.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild
index 769264fd387c..bf8705f64b41 100644
--- a/sys-cluster/torque/torque-4.2.10.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r1.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
@@ -9,7 +9,8 @@ DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
 # TODO:  hopefully moving to github tags soon
 # http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz"
+#SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz"
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b6157164a8846e5b60f42a5ae7f6.tar.gz -> ${P}-gh-20150517.tar.gz"
 
 LICENSE="torque-2.5"
 SLOT="0"
@@ -42,7 +43,7 @@ RDEPEND="${DEPEND_COMMON}
 	!crypt? ( net-misc/netkit-rsh )
 	!dev-libs/uthash"
 
-S="${WORKDIR}"/${PN}-4.2.9
+S="${WORKDIR}"/${PN}-ddf5c4f40091b6157164a8846e5b60f42a5ae7f6
 
 # Torque should depend on dev-libs/uthash but that's pretty much impossible
 # to patch in as they ship with a broken configure such that files referenced
@@ -90,14 +91,11 @@ src_prepare() {
 	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
 
 	eapply "${FILESDIR}"/${PN}-4.2.9-tcl8.6.patch
-
-	# 524362
-	eapply "${FILESDIR}"/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch
-
 	eapply "${FILESDIR}"/${PN}-4.2-dont-mess-with-cflags.patch
+	eapply "${FILESDIR}"/${PN}-4.2-use-NULL-instead-of-char0.patch
 	eapply_user
 	mkdir -p "${S}"/m4
-	eautoconf
+	eautoreconf
 }
 
 src_configure() {
@@ -177,7 +175,7 @@ pkg_postinst() {
 		showmessage=0;
 		elog "If this is the first time torque has been installed, then you are not"
 		elog "ready to start the server.  Please refer to the documentation located at:"
-		elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
+		elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/help.htm#topics/1-installConfig/initializeConfigOnServer.htm"
 		elog
 	else
 		for i in ${REPLACING_VERSIONS} ; do
diff --git a/sys-cluster/torque/torque-4.2.9-r5.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild
deleted file mode 100644
index d972010f7c74..000000000000
--- a/sys-cluster/torque/torque-4.2.9-r5.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-# TODO:  hopefully moving to github tags soon
-# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz"
-
-LICENSE="torque-2.5"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
-
-DEPEND_COMMON="
-	sys-libs/zlib
-	sys-libs/readline:0=
-	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	cpusets? ( sys-apps/hwloc )
-	munge? ( sys-auth/munge )
-	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
-	tk? (
-		dev-lang/tk:0=
-		dev-lang/tcl:0=
-	)
-	syslog? ( virtual/logger )
-	!!games-util/qstat"
-
-# libncurses.so is only needed for configure check on readline
-DEPEND="${DEPEND_COMMON}
-	sys-libs/ncurses:*
-	!!sys-cluster/slurm"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!dev-libs/uthash"
-
-# Torque should depend on dev-libs/uthash but that's pretty much impossible
-# to patch in as they ship with a broken configure such that files referenced
-# by the configure.ac and Makefile.am are missing.
-# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
-
-	# Find a Torque server to use.  Check environment, then
-	# current setup (if any), and fall back on current hostname.
-	if [ -z "${PBS_SERVER_NAME}" ]; then
-		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
-		else
-			PBS_SERVER_NAME=$(hostname -f)
-		fi
-	fi
-
-	if use cpusets; then
-		if ! use kernel_linux; then
-			einfo
-			elog "    Torque currently only has support for cpusets in linux."
-			elog "Assuming you didn't really want this USE flag and ignoring its state."
-			einfo
-		else
-			linux-info_pkg_setup
-			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
-				einfo
-				elog "    Torque support for cpusets will require that you recompile"
-				elog "your kernel with CONFIG_CPUSETS enabled."
-				einfo
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# Unused and causes breakage when switching from glibc to tirpc.
-	# https://github.com/adaptivecomputing/torque/pull/148
-	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-
-	# We install to a valid location, no need to muck with ld.so.conf
-	# --without-loadlibfile is supposed to do this for us...
-	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
-
-	epatch "${FILESDIR}"/${P}-tcl8.6.patch
-
-	# 524362
-	epatch "${FILESDIR}"/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch
-}
-
-src_configure() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		$(use_enable drmaa) \
-		$(use_enable munge munge-auth) \
-		$(use_enable nvidia nvidia-gpus) \
-		$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		--with-tcp-retry-limit=2 \
-		--without-loadlibfile \
-		${myconf}
-}
-
-src_install() {
-	local dir
-
-	DOCS=( CHANGELOG README.* Release_Notes )
-	use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf )
-
-	default
-
-	# The build script isn't alternative install location friendly,
-	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
-	for file in $(find "${ED}" -iname tclIndex); do
-		sed \
-			-e "s/${ED//\// }/ /" \
-			-i "${file}" || die
-	done
-
-	for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do
-		keepdir "${dir#${ED}}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
-	newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
-	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
-	newenvd "${FILESDIR}"/${PN}-env.d 25${PN}
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
-	fi
-
-	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
-		cp \
-			"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
-			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
-	fi
-
-	echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die
-
-	# Fix up the env.d file to use our set server home.
-	sed \
-		-e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \
-		-i "${ED}"/etc/env.d/25${PN} || die
-
-	if use munge; then
-		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog "    If this is the first time torque has been installed, then you are not"
-	elog "ready to start the server.  Please refer to the documentation located at:"
-	elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
-		echo
-		elog "Important 4.0+ updates"
-		elog "  - The on-wire protocol version has been changed."
-		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-		elog "    trqauthd to your default runlevel."
-	fi
-}
diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.4.ebuild
index ec9563e95bfa..42f1f078421e 100644
--- a/sys-cluster/torque/torque-6.0.3.ebuild
+++ b/sys-cluster/torque/torque-6.0.4.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic eutils linux-info
+inherit autotools flag-o-matic linux-info
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-DISTFILEHASH="1485300822_19e79ad"
-SRC_URI="http://wpfilebase.s3.amazonaws.com/torque/${P}-${DISTFILEHASH}.tar.gz"
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz"
 
 LICENSE="torque-2.5"
 SLOT="0"
@@ -47,7 +46,11 @@ RDEPEND="${DEPEND_COMMON}
 # by the configure.ac and Makefile.am are missing.
 # http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
 
-S="${WORKDIR}"/${P}-${DISTFILEHASH}
+S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
+)
 
 pkg_setup() {
 	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
@@ -81,10 +84,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-emptystring-comparison.patch
+	default
 	# We install to a valid location, no need to muck with ld.so.conf
 	# --without-loadlibfile is supposed to do this for us...
 	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
+	eautoreconf
 }
 
 src_configure() {
@@ -165,15 +169,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "    If this is the first time torque has been installed, then you are not"
-	elog "ready to start the server.  Please refer to the documentation located at:"
-	elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
-		echo
-		elog "Important 4.0+ updates"
-		elog "  - The on-wire protocol version has been changed."
-		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-		elog "    trqauthd to your default runlevel."
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "If this is the first time torque has been installed, then you are not"
+		elog "ready to start the server.  Please refer to the documentation located at:"
+		elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
 	fi
 }
diff --git a/sys-cluster/zookeepercli/Manifest b/sys-cluster/zookeepercli/Manifest
index ddc0d7b36b59..3a1dabb9d196 100644
--- a/sys-cluster/zookeepercli/Manifest
+++ b/sys-cluster/zookeepercli/Manifest
@@ -1,5 +1,5 @@
 DIST go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz 29301 BLAKE2B db6f18d03187ae502a9755709de0100e01521fb9077d4240c72a7c99e2cf16a1fe96fcd582723d503fbaa53158c9a5feb43c787a98fec1f61f84f50fb69410c8 SHA512 0fda62feaa668b43bdc7866270780b30069d7dace5c25c69d27d5df17bc3331885c9a7d3575b822c4da712e8a4af0465c6370cd3e89f6c39e73d70aed346d599
 DIST golib-2418949ac30d9933e7412ccce41f1aa2ae8d5ae8.tar.gz 5892 BLAKE2B 5fa26796cd008d79f5df32aeb0398d627c958bd07d27b5a10b1d1f8ae1cd77688b0e114b8022099e98ae06884d3b5e830d9a554fe780f58b4f64866cb2ee0f45 SHA512 924b9e296f5d0051f321115b542603653d8868d3bc8cb933b16eaa511c34bb9869fc763ea2f2261a71e8dbe06c5e1963ff202986f496d7d889a55ae7694704ec
 DIST zookeepercli-1.0.10.tar.gz 11942 BLAKE2B d9683dc441642641e9f72b244a75a76194e4fe9cc80e8f85be007dfd88d4e92703da8b66d264b732a08ab3b66ab3d2ff83e7654c3b97a74f827f85bd9cc9ee8f SHA512 793de5eb2b62265a97c6e82f14c7ba1f9d32dacb86a02375a18ca6cbf472d5b7649e94107e3c497e81d4b81f7131b85032ba100c2d8f14a47fd8fc972c6be47d
-EBUILD zookeepercli-1.0.10.ebuild 1575 BLAKE2B e58f74f2b6d370e7ac716738148c8a2a85ce1c515dff2397c5a4d33cf3aa944985bbd75889f8d341ba6477cee68d465bb4f6b57d5446722b4c3183eebe9c9136 SHA512 f8594d1058f3a811b98328c65d566f61be389590cb3659ed17c1c622fcacc3a40891ce4783c999f5a2580fbd559b720f21f37c2a0284991cfbdda32501a48672
+EBUILD zookeepercli-1.0.10.ebuild 1614 BLAKE2B e7de60ebf86f9e3bda2928236b0932d3bd22d0a0328e66c263eb42717b9e2ddc14317231559ac7e879e399b567d6e59118660f781c37580c4bf712c3ff6ad659 SHA512 e845d780873f2435c008a36583232c2f77beed717462d645a7a875a5282da1c86d1727a185b42d4ed853408011d8f3ce4316b87110bf64537d027377c54076d8
 MISC metadata.xml 330 BLAKE2B 39902629c95b8860082ab3a9f1f844f54fff912225f007cbdf6c4c2aa0c4c433643ec3911d7e4233ce0cb2f7594d6d86916d025b16e7677cdf3c46dfaf13a260 SHA512 4330eb8e97dbe6441726384149b6090b77c6276ce02547731756968bf255f8d632fdf5f1ebf77f66c977fdd5d75672b2dbc31e1ac0f29678e0f07b27484f37b6
diff --git a/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild b/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
index 7013d4a1a820..fe03fb04c045 100644
--- a/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
+++ b/sys-cluster/zookeepercli/zookeepercli-1.0.10.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
@@ -50,6 +50,7 @@ src_unpack() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678960
 	GOPATH="${S}" \
 		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /sys-cluster
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)