gentoo resync : 19.07.2019

20 files changed, 453 insertions, 46 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a8828b21fed1..1597e33e7c69 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index c1b79ab2b8ff..90c40c9ee423 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -30,7 +30,6 @@ AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d0
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
 AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38
-AUX ceph-14.2.1-ncurses-tinfo.patch 959 BLAKE2B f13e6fd85401cba869cc459568e731ff43176b75ff427ee7b16ed714cc0ac49437c4d8532cffd79e724dc2a48a142391f138c8669fda78a1091dcb98b9d8dd96 SHA512 7ea763a87ce14fc1a1a33f84e96d6fbd36af8833080e53eaa7ea674219e86c76a087766ef28091d6ea0667b170340a46ceca2300501a61265ae6cb66904eb82e
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -51,11 +50,11 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
-DIST ceph-14.2.1.tar.gz 117111511 BLAKE2B c00181223c6e02e7fe696ed4226f1751eca48e799f8b5377a06621eb3300f81b58dc20f325b455df04fcbd0c28b981fae1cfc778a8d69414247ddd206d0c6175 SHA512 fccde341344c721fbfc7f7cb73db4f65933d7fcacc9495398b55b37d1e208f0bad0cd78a4da08a3b5e26cca3175e7707f7dfb76fae5aa094f58afaed8603c866
+DIST ceph-14.2.2.tar.gz 117536881 BLAKE2B 2926c3d6fde5e9540d4e797dabf61451ce78e5d2f8d382d192fd8c1759620075860ab0cea7512330f2965d11e4b37a0ecce4fa11d9c5d256ecc884fa5f604922 SHA512 1ce61fb75e331cca39aaa8c0498bbb3cb874edb22ea45a4c2d82171b5e0c7c4ab2b081674b77177d5e612a0efdfa01de10a4becc4a7ee0eed1b2b3d358a72dc1
 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
 EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
-EBUILD ceph-14.2.1.ebuild 10034 BLAKE2B b179d248d3b80566cdd061463beea542ec7013646c429cb179620f09db0c485f6e6cb6192df0c37c398f167d57e6fcbd7e0d51df543abd32ddf72a932a9b0283 SHA512 be69c25fac899365a3fb5074233fc8e6561e5f1c35a2cd21a712cc218c5aef7ff220eeecbcf1c2412fec67aca4bd147a5d35077930adf5f9a41011935eb6b905
+EBUILD ceph-14.2.2.ebuild 10064 BLAKE2B 541bfe6eab26c3d8fa2a9dd64ac6287252eace7d2648d3395431956cf79687740eb3c11f6af5f0cbfc484a789b16d0e2b019289f88981ec013f9160a71687648 SHA512 4879ef1d46d9e152f8199fa7811d6341f7e7dcdc1a9904b5cda4129319ca89104141a93b82b227fb548753fbe889791e46c065349c0c71b1c9fc76a53a866c2f
 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-14.2.1.ebuild b/sys-cluster/ceph/ceph-14.2.2.ebuild
index 6cab06ebd9c3..0f25b21d3b71 100644
--- a/sys-cluster/ceph/ceph-14.2.1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.2.ebuild
@@ -152,7 +152,6 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-14.2.1-ncurses-tinfo.patch"
 )
 
 # dpdk and ninja don't get along
@@ -227,6 +226,7 @@ ceph_src_configure() {
 		-DWITH_MGR_DASHBOARD_FRONTEND=NO
 		-DWITH_NUMA=$(usex numa)
 		-DWITH_OPENLDAP=$(usex ldap)
+		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
 		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
 		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
 		-DWITH_RADOSGW=$(usex radosgw)
diff --git a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch
deleted file mode 100644
index 7f74a102d777..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7bf406cff5e0f82fc87f19d5987cd4e719919e1 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 8 Apr 2019 16:34:53 +0200
-Subject: [PATCH] cmake: Fix build against ncurses with separate libtinfo
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/tools/rbd/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
-index 36b2408a8d28..0e38a033ff55 100644
---- a/src/tools/rbd/CMakeLists.txt
-+++ b/src/tools/rbd/CMakeLists.txt
-@@ -1,3 +1,6 @@
-+set(CURSES_NEED_NCURSES TRUE)
-+find_package(Curses REQUIRED)
-+
- set(rbd_srcs
-   rbd.cc
-   ArgumentTypes.cc
-@@ -52,7 +55,7 @@ target_link_libraries(rbd librbd librados
-   cls_journal_client cls_rbd_client
-   rbd_types
-   journal
--  ceph-common global ncurses
-+  ceph-common global ${CURSES_LIBRARIES}
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
- if(WITH_KRBD)
-   target_link_libraries(rbd 
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 3456a6aaaad5..0250d9a15482 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,8 +1,11 @@
+AUX charliecloud-0.10-fix-hardcoded-gcc.patch 1944 BLAKE2B 920697592b47f532a335c493ffa381b08852d628f76bf1e7abbdad299ca5d3431e2bb9d3713cb12dc6e532fc9e1a3a8bda3acc2639c6a0a309fe13347763a8cd SHA512 0c911ec270bdda5d2025faf09ce45961dfaf307b03e9d293630adc49747e1f750273a8ce5c0f46a2756d3ef97312684f7afbfc125c80cbd61384722437bc0dfd
 AUX charliecloud-0.9.10-fix-flags.patch 1471 BLAKE2B 637d7fc18126a5842006233468da626a9e26c9e66c1efbf5112c0c391795a27885a28f90035894d6d529ad58926c59a9fb4ee50d8759a5d259b2e59ffef749f1 SHA512 6dae473e0583f3a167f88d1dc7006dfa0120d6f2a3508ca63e499dbbb9e1e2ef78041093144efa350d6a9653ac2de1d5b36f71b071af7577f467933d590a0379
 AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9de06eb023557bd9934708dda8ff5d948fc8240484b5cb2a0404fd2184da2759c2c08e6dd4842e5dd60b6d9af92f12a4734557df49f13 SHA512 5dfab73c4242bad9620dca71737d69215f43c8b109d25bcd2156166d2bd83d328011c6d448ee87d5f54908ea7946283ba200a865c61500912da95b7acf6c13ad
+DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
 DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
 DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
+EBUILD charliecloud-0.10.ebuild 1514 BLAKE2B 46d8d2699fd8019f4aa9d72310607d2d77b97b1abd7e2b58a045cf6c6c6bff3ba3475c4be17f70b4a49a49b7f38b08ef87d801c34458923514a29f3b1f92e0d5 SHA512 b36cd40e8b3444d3d025f3672292cc82e0712001ac6bc774f9fbcc21ffff759be795aa309009ee590a9bb1855533c8a113a94e37ec2940bd23bb4f15f7ca3689
 EBUILD charliecloud-0.9.10.ebuild 1509 BLAKE2B 13fcc75ca82b10e34d44e93927ca79586d01e8f6c84bd3a6a109ee2be4ace68a8e85328e99b01eaaef20d66f595998eb540c387ab2d0d4be2db2d2f6a81ddbd3 SHA512 1c4975683bb9ec0e0762c1fcc1600177f80c4b7040b4d51e3c3f5b99dc480b6611cb725d8f21975bd63e51fbc97700d5152db4df6aaa84068e8fc1ed508dabb9
 EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
-EBUILD charliecloud-9999.ebuild 1335 BLAKE2B 82e9dbb1754feb1f93da68bc9342068a0d2dc4c2c700573ebf5502fc90b995d3e3db92141a9b9f5fbf0700e69ea2f0716a8ec6ecff0d929bf23b0b9998e61809 SHA512 00a9fd27b62c498219af402db3d2f694be02ec1605e5871dc09c71880d68b926772cec9e1dea6bb0311dcbd829162f9c6fb9887a936278b1b31a411003acd9a7
-MISC metadata.xml 699 BLAKE2B 778ae447db939c0593dd147ad669e07fe8de217079988f82bd21ca545f1afe8056347173028056a9f0407a72b435dfc021dccbed1d860491712351ae727906b3 SHA512 2b19c7878b104128f537b3b5ab2070a3f643ae536af3f91ab52284aa13ae5752e4e8c012a51fa4261e140154f0c2c49f1aa480b22ace552fdab5067174247515
+EBUILD charliecloud-9999.ebuild 1381 BLAKE2B c3e7bafafd5609f776860129a62e021f275272772319dc1a5c8252ea8541ad11c9cc1e3e27a2685f282a10c3d91783d7526ffdfb0b77245ca6f05af4f3f11975 SHA512 d56ed1c9a737f0bb864f4c8b99c17df70a92c64c435eac3109dae5c9f4a1c2d0a4abcf1285fe5d8f17b43144087138b9e95cb0283e2288298750fd4e8a1ca840
+MISC metadata.xml 782 BLAKE2B 8eb3cbbd39486b78ffaf3b932804536d900cbbded17dc41437bece7f47f6edbe8fe76d99b695f220c7477356e93ffad16a137a902a026ded8ab5098b7a44ade6 SHA512 775f7de9e4f296a5d13bf66df50b935866d4ca87b2d13678ba03ee5ee72f2740d17c9c2ba69e221efef7ca4038129d7704f1e13c738227e87cd7b869cd7d63db
diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
new file mode 100644
index 000000000000..b5e0b1e21ce3
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples +pv squashfuse"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	pv? ( sys-apps/pv )
+	squashfuse? ( sys-fs/squashfuse )
+"
+DEPEND="doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		net-misc/rsync
+	)"
+
+PATCHES=(
+	# See upstream bug: https://github.com/hpc/charliecloud/pull/481/
+	"${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
+)
+
+src_compile() {
+	emake
+	use doc && emake -C doc-src
+}
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index a10f56497f10..dae07ff3e273 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="doc examples +pv"
+IUSE="doc examples +pv squashfuse"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -32,6 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
+	squashfuse? ( sys-fs/squashfuse )
 "
 DEPEND="doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
new file mode 100644
index 000000000000..07e72b2fbd3e
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
@@ -0,0 +1,45 @@
+From bae9f01ed5ad0ef5d6c0b48cbc1a7fde73ae45ae Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Mon, 15 Jul 2019 18:36:24 +0200
+Subject: [PATCH] test/Makefile: Remove hardcoded call to gcc, error out if
+ CC=icc.
+
+---
+ test/Makefile | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 97a9316b..7c28ce2a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -10,7 +10,7 @@ images_eg := $(sort $(wildcard ../examples/*/*/Build)) \
+              $(sort $(wildcard ../examples/*/*/Docker_Pull)) \
+              $(sort $(wildcard ../examples/*/*/Docker_Pull.*))
+ images := $(images_ch) $(images_eg)
+-sotests := sotest/bin/sotest sotest/lib/libsotest.so.1.0
++sotests := check-no-icc sotest/bin/sotest sotest/lib/libsotest.so.1.0
+ 
+ # Favor embedded Bats, if installed, over system Bats.
+ export PATH := $(CURDIR)/bats/bin:$(PATH)
+@@ -76,13 +76,18 @@ sotest/bin/sotest: sotest/sotest
+ sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
+ 	cp -a $^ $@
+ 
+-# We hardcode gcc here because some other compilers (hello, Intel) link the
++# We exclude icc here because it links the
+ # resulting binaries with extra shared libraries that are then not copied into
+ # the container. (Issue #227.)
+ 
++check-no-icc:
++ifeq ($(patsubst %icc,,$(lastword $(CC))),)
++	$(error ICC not supported since it overlinks extra shared libraries)
++endif
++
+ sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
+-	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
++	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
+ sotest/libsotest.so.1.0: sotest/libsotest.c
+-	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
++	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
+ 	ln -f -s libsotest.so.1.0 sotest/libsotest.so
+ 	ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 6db8cc60e6a4..584c30766905 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -18,5 +18,6 @@
   </upstream>
   <use>
     <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</flag>
+    <flag name='squashfuse'>Use sys-fs/squashfuse for the SquashFS workflow</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest
index e963a9019a06..96af1058f6ed 100644
--- a/sys-cluster/hpl/Manifest
+++ b/sys-cluster/hpl/Manifest
@@ -1,3 +1,3 @@
 DIST hpl-2.0.tar.gz 591087 BLAKE2B d3fd738c40f89916c7a5a7cbb561d30c8b9defd08d552b6aeea707f2b6b87a4774d6dce4b9fd7983ee12b112f319e574b89fd8158a381e997dfb86a3572d5f95 SHA512 3aa76144526b01ec40d940cae50d47e480e2760a36d1e95bc6e431b216407db190946fc3d99a6a7caf7b61bcc76d805d28da3ef0b141ff467854e1cdf10bb274
-EBUILD hpl-2.0-r3.ebuild 1850 BLAKE2B 8216b10ee951bbc22d9c73e4dc29942ac0206931fd17b8784a1c9b3b33af6389ea309cbfc093a182dc04ae22a870438b602b847ece6e81b178ae02464fa0e474 SHA512 14521f5ac2f74dd8cb8a744bc29d23749d7575e5a7b4924f506a54afb0d87ef71bbbb6837c6e082bf470411e6e084993bec15ec51c26e634ac9bb6c8d83912d4
+EBUILD hpl-2.0-r3.ebuild 1847 BLAKE2B 5c7baa924b3db87844c4f51eac8fb4231383e9ca40d9e38f93339520bd50df87b85f415e284315062eb47233656aa02029d43429c1559501c8040a3fdea6234e SHA512 805ea7827a3fadb4558b90f2d137db5abc19a9ffe41594a18908df6b336f369c9610b3fa7e201e80b180a71fc6741feec46d19e925d375224142e2fec95331e2
 MISC metadata.xml 263 BLAKE2B c9db7dc7f12c1017bee420587681f80a838eba2efed271c5a1fafa4595993917ea14b69fcc865a225561fa736bd93d9bfdac7b830a50d78707428d7fec4e987e SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5
diff --git a/sys-cluster/hpl/hpl-2.0-r3.ebuild b/sys-cluster/hpl/hpl-2.0-r3.ebuild
index 8f94c4548d43..b30231cb5deb 100644
--- a/sys-cluster/hpl/hpl-2.0-r3.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="HPL"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 5e874be64215..906fc9f7ae73 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -9,6 +9,7 @@ DIST keepalived-2.0.12.tar.gz 947015 BLAKE2B c6c47bbc19bc8b31ae6c2d30616a5cfe90b
 DIST keepalived-2.0.13.tar.gz 955953 BLAKE2B f6a8d23cdcf4b8484c37da9d48c12394617d36b1a2bba901c899d3397ed5a2ba048a73d98cf137df3c53359b4e83c382b9a958559303e8d1130316a6026a5d3b SHA512 5e33104d114794f9050958d06730d7ecb89e87157a043146509583df595d8e01439a8f1172abb7d2bca0e8e710a4ff6d364dbb0a89f5aafa632e7af2453f3966
 DIST keepalived-2.0.15.tar.gz 972461 BLAKE2B 7c57d4ecdec7efe5dcb477e92daf4e6ee947ec66c3dc68a96fe0a7f07656a3c503751f10e9448f80e896b63d987fa9448bb264537106685cfac88ca87096721f SHA512 d426f2d917f72264944e8324409838287d4c535dfd5b5574a41c06828efc9095a2304f87a6435a067d4ad88ad5619108f7de97abb4a257a4c30e335929978dd1
 DIST keepalived-2.0.16.tar.gz 983376 BLAKE2B 6196c617123d0c026cf4476f3e788ef797ebf24649a41ed1cfe360843bfb793d7115e2eaff499154ac84d8d4854ecfbfb6839339878502917a9173a8141545e6 SHA512 290af548c84a369f69df74ca96f8de6e2e6cf20abc7ca03ccad6217856192f4109620b59406b0e829f486c148bc6a4ed3a5efe82c12eeb9314a24471c03f95bd
+DIST keepalived-2.0.17.tar.gz 1003077 BLAKE2B 68ce64145f917267f6f156fc7b4ffb05ce0bd24b64ddfb3cb2ae8b54850586cffa04c0b617a0f1c6cffd659bba208c145051e436e002ee048908c44fa1c433ff SHA512 6bbcd76604785ef11af4df0a72015ff75a3f47fd04dbe15913f1a30bc80371a188f54020dca881a2b6a562e6ea0b1c5c9c4561c46aa4bdbb8c9f3c54b411d1df
 EBUILD keepalived-2.0.10-r1.ebuild 1797 BLAKE2B 1abc83adbdfae01b5ee03470164975fc2df917a54e8f72b9f77af28171cf7797524a7361600be6d61a7293d4546d544d105151e4027e387f209da5b637c89f40 SHA512 b1d9cb8a2471cd6a84892cc3a2bfd5d25212c509f9cd60dc32c0bc6e393a0d918ed277896848fa48a9ff04f4cd54f35804f9ec2537f884052fc9d683c6d3b0ea
 EBUILD keepalived-2.0.11.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
 EBUILD keepalived-2.0.12.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
@@ -16,4 +17,5 @@ EBUILD keepalived-2.0.13-r1.ebuild 2238 BLAKE2B c1efbbe69af62c378bc3a3c39a7fec7d
 EBUILD keepalived-2.0.13.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
 EBUILD keepalived-2.0.15.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
 EBUILD keepalived-2.0.16.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
+EBUILD keepalived-2.0.17.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
 MISC metadata.xml 640 BLAKE2B 5644b98bf487637c431299fe61e1185731d9fc22e9a19b9a3218855318a9c40500339c628671eb958c2bcee99d867a8e9c93903fdcdad25ad566659422dd2119 SHA512 6fd4981067e0a2e74511db7be79d656c62b39c1f43f860e0d981b6c9770cb2da6b4fd3e40af1ed23adc8bbbd01202e6c45e58b6f86480a807d193aae1a3f7ad3
diff --git a/sys-cluster/keepalived/keepalived-2.0.17.ebuild b/sys-cluster/keepalived/keepalived-2.0.17.ebuild
new file mode 100644
index 000000000000..a00ef1ac4008
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.17.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus debug -json regex snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	regex? ( >=dev-libs/libpcre2-8 )
+	dbus? ( sys-apps/dbus dev-libs/glib:2 )
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# keepalived has support to dynamically use some libraries instead of
+	# linking them:
+	#--enable-dynamic-linking \
+	#--enable-libiptc-dynamic \
+	#--enable-libnl-dynamic \
+	#--enable-libxtables-dynamic \
+	STRIP=/bin/true \
+	econf \
+		--with-init=custom \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable bfd) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable regex) \
+		$(use_enable regex regex-timers ) \
+		$(use_enable snmp) \
+		$(use_enable snmp snmp-checker) \
+		$(use_enable snmp snmp-rfc) \
+		$(use_enable snmp snmp-rfcv2) \
+		$(use_enable snmp snmp-rfcv3) \
+		$(use_enable snmp snmp-vrrp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	use snmp && dodoc doc/*MIB.txt
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}
diff --git a/sys-cluster/lspbs/Manifest b/sys-cluster/lspbs/Manifest
index 6743d62d42d4..f2a17bd1a3c9 100644
--- a/sys-cluster/lspbs/Manifest
+++ b/sys-cluster/lspbs/Manifest
@@ -1,3 +1,3 @@
 DIST lspbs-1.1.tar.gz 69265 BLAKE2B 6daf02e03effb8ef4f54a1e016881e8d38803c4aee56c6942d1ccb5736d02aea696a7045d8afce3da06326a1d1c2974fe36d7d1dcde5b51dcafcd3e467c4b7b2 SHA512 4732767968d3226a88617fd60796811c8fef6e7ba717e66e31867b06045a1483d4be65f795a8fde81598efdd5e6cdaf688d52cac9cb0c8f888d9420f539b2730
-EBUILD lspbs-1.1-r1.ebuild 695 BLAKE2B ae4b094b894094a2aa55db16b415e83712aa0acdf05c09f89e1fd4421c2dde20f2658201b3670ad54a0e638506addf5072bf4f40f45ef843b7c1b82977f6b175 SHA512 0474f2e0b548b9fea761a3b08b56ced132530850e47d929509e432e59a189eabb4050bb5bb9242fbd6df74334bcd4b02332891fe0225f442256ec101733fe61f
+EBUILD lspbs-1.1-r1.ebuild 692 BLAKE2B b1839399906e049c78b0a64b99c10a679eb4d64342bdd0b070755a4407d5d976f27b28b77c041b7029f688061142fdcad4a1e341ed2149c243c7fa96e508c590 SHA512 b13fc5edbdbf483fc8aee0d2a13644afa93f5b04c193896264c3226024dac60fbd2101650fd6d65c8326dcfdc5e4509c9bdff74822cd27c113d17407b87fa189
 MISC metadata.xml 833 BLAKE2B a943d1a2ab78896ce6c055ebef5b6ed79f1aa778c818497801548f3d5e5bccf0cfdb1695cf38654656ba55808f6ade3d67848099f46814bcfccf7f879c0f8762 SHA512 939ff6cd4dcfadca5196014cd570cbf51dfbd5af543a99768d43b3c7c76193f83305d13c718da26e7cc806703067dab6cf5482e8323bd9036895b23ce61ba824
diff --git a/sys-cluster/lspbs/lspbs-1.1-r1.ebuild b/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
index e4aeaf9d1249..5da338aa2062 100644
--- a/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
+++ b/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -13,7 +13,7 @@ RDEPEND="${DEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
diff --git a/sys-cluster/mvapich2/Manifest b/sys-cluster/mvapich2/Manifest
index 0f8673b13e20..bfd74bf00412 100644
--- a/sys-cluster/mvapich2/Manifest
+++ b/sys-cluster/mvapich2/Manifest
@@ -1,3 +1,3 @@
 DIST mvapich2-1.6.tgz 23239787 BLAKE2B 4cdd286d7a13f70b50ced6ac6cb3df51065225a33141410b699246f2b99d0f4b57611cd95f39806387c71d0f07257560c6f210ed4bbb8ce5fa5d2b8b7071db2c SHA512 4a4aac17742f347c4daed40a8360576ff4c644c549d4a3b364c7d2b1eada6aecc514b447b4613111e113d8f9be79b5101a999298cf89ff19ce63523a54702289
-EBUILD mvapich2-1.6.ebuild 3853 BLAKE2B 42c0e234109595f0e32b8e79934d1f7a82743ee599773267ae94c456e03414ff1d1ff1ca76b011d73766a2aa2f21a8aa65a62d289676d8323e18ae4b948a45de SHA512 766a44474f7e4ee6cf7f92030ecbc4637f4f0715143265df1d4283d92283bf8954b042c40954e1eca480cd13708d7ea8d4fea74545f2335f7c8beb668de89fc7
+EBUILD mvapich2-1.6.ebuild 3850 BLAKE2B 91b38035b4827782a056777513d19e9616c99c7741440edfa628e63237aaf4e543080a60baa4a86fec581e0a28503f9722684a71834d9ee15ff9cb1841a58ce4 SHA512 78935009e936874086b07b18c04132462b1216302b0483ce3f6b1cdaa9c889406fc19c18685118492cfb0b08bf68422dd543b9629e184ca06f53a46cd9248c75
 MISC metadata.xml 646 BLAKE2B e656b3bb792c7058861e1b1f5ee548c3fbecd238d6d016035a12f750f7549d7c9e1260b579f1b8ca1e8742ca6d4d68d6c54a8396dca3e7ab4f4af298ac01b69c SHA512 251bae667db76befd899a01a8f1c658f4552f2a4c0e0790489c7b0d8e984fcf3f08b2954e9dcb2ddc4d3b7a4d0bb8a82aee5d004c9dabb4b760e1c7d0ec3b67a
diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6.ebuild
index caac58cb0d88..6277a6a7a4c0 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6.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="4"
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tgz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug fortran large-cluster medium-cluster romio threads"
 
 RDEPEND="
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 20d5db9834e7..eb31a38a5a60 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -9,6 +9,7 @@ AUX torque-4.2-dont-mess-with-cflags.patch 806 BLAKE2B d4be6b841f354c5ab9eca24cd
 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-6.0.4-no-openssl.patch 1926 BLAKE2B 387843f6117ebdb1a9ca0f9fe3363dd2b2ab45aced82e3e9c60cb11009fef1dd97afeb9e525a3a5d70885b6cd19cc20333dc9d009453ade63bad8c39fb82d578 SHA512 1370c280860eb31d2a7e09b7bef6d9f2d6d7651ba0c67db7c7c912ec72b78f6ca33f7f5b716afc69a10f8c3efd55d5702f8e894596de78a91a346ec28d83e5dc
 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
@@ -18,5 +19,6 @@ DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df
 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-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8
+EBUILD torque-6.0.4-r1.ebuild 5428 BLAKE2B cc1a8ada29520b3af36457e25f639ed70d9c8d9f724702be6bf8cdad5c125ed8303fec67450c79f233a890340d5ff904982e89b2e2b22003bc69d81b197b915f SHA512 21fabe1c45f965af746e722b54478a183d48f4f3934f65e312bb57b1ada6024044cc966e0d729e05b3c3e83b75092687b2a5bd20acf47376deeb58b38503b0fb
 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/torque-6.0.4-no-openssl.patch b/sys-cluster/torque/files/torque-6.0.4-no-openssl.patch
new file mode 100644
index 000000000000..3b7e3cd49188
--- /dev/null
+++ b/sys-cluster/torque/files/torque-6.0.4-no-openssl.patch
@@ -0,0 +1,60 @@
+From 840bee84bff9529f2f7de4293cf7d5f567985123 Mon Sep 17 00:00:00 2001
+From: Matt Ezell <ezellma@ornl.gov>
+Date: Thu, 8 Oct 2015 15:32:30 -0400
+Subject: [PATCH] Remove unnecessary dependency on openssl-devel
+
+Closes #219
+---
+ README.building_40            |  3 ---
+ configure.ac                  | 10 ----------
+ src/daemon_client/Makefile.am |  2 +-
+ 3 files changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/README.building_40 b/README.building_40
+index bd2af03070..4b3a8c5f8a 100644
+--- a/README.building_40
++++ b/README.building_40
+@@ -14,9 +14,6 @@ automake
+ libtool
+ pkg-config
+ 
+-Non-standard packages required for building the source:
+-libssl-dev (name may vary among OSes)
+-
+ *** For admins that use cpusets in any form ***
+ hwloc version 1.1 or greater is now required for building TORQUE with cpusets, as pbs_mom now uses the 
+ hwloc API to create the cpusets instead of creating them manually.
+diff --git a/configure.ac b/configure.ac
+index 14f238a519..636575c1b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -745,16 +745,6 @@ AC_CHECK_LIB(pthread, pthread_create,
+ LIBS="$LIBS $PTHREAD_LIBS"
+ 
+ 
+-dnl we need -lssl and -lcrypto, lets make sure they exist
+-AC_CHECK_LIB(ssl, SSL_accept,
+-  [],
+-  [AC_MSG_ERROR([TORQUE needs lib openssl-devel in order to build]) ])
+-AC_CHECK_LIB(crypto, BN_init,
+-  [],
+-  [AC_MSG_ERROR([TORQUE needs lib crypto (often openssl-devel) in order to build]) ])
+-
+-
+-
+ dnl
+ dnl we need libxml2
+ dnl 
+diff --git a/src/daemon_client/Makefile.am b/src/daemon_client/Makefile.am
+index e39f5e70b2..fe9d592b06 100644
+--- a/src/daemon_client/Makefile.am
++++ b/src/daemon_client/Makefile.am
+@@ -5,7 +5,7 @@ CLEANFILES = *.gcda *.gcno *.gcov
+ 
+ include_HEADERS = trq_auth_daemon.h
+ 
+-AM_CFLAGS = -DPBS_SERVER_HOME=\"$(PBS_SERVER_HOME)\" -Wall -pthread -ldl -lrt -lssl -lcrypto
++AM_CFLAGS = -DPBS_SERVER_HOME=\"$(PBS_SERVER_HOME)\" -Wall -pthread -ldl -lrt
+ 
+ sbin_PROGRAMS = trqauthd
+ 
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
new file mode 100644
index 000000000000..bc520dc0ace3
--- /dev/null
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz"
+
+LICENSE="torque-2.5"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk"
+
+DEPEND_COMMON="
+	sys-libs/zlib
+	sys-libs/readline:0=
+	dev-libs/libxml2
+	>=dev-libs/boost-1.41
+	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
+
+S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
+	"${FILESDIR}"/${P}-no-openssl.patch
+)
+
+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 || use cgroups; then
+		if ! use kernel_linux; then
+			einfo
+			elog "    Torque currently only has support for cpusets and cgroups 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() {
+	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() {
+	econf \
+		$(use_enable tk gui) \
+		$(use_enable tk tcl-qstat) \
+		$(use_enable syslog) \
+		$(use_enable server) \
+		$(use_enable drmaa) \
+		$(use_enable munge munge-auth) \
+		$(use_enable nvidia nvidia-gpus) \
+		$(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
+		$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
+		$(usex kernel_linux $(use_enable cpusets geometry-request) --disable-geometry-request) \
+		$(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
+		$(use_enable autorun) \
+		$(use_enable quickcommit) \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		--with-default-server=${PBS_SERVER_NAME} \
+		--disable-gcc-warnings \
+		--disable-silent-rules \
+		--with-tcp-retry-limit=2 \
+		--without-loadlibfile
+}
+
+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() {
+	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
+}